commit 8a5322984f2d81bcbfd8d44c59747a11bd9b904b
author Alex Vakulenko <avakulenko@chromium.org> Mon Jun 16 17:18:44 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Jun 18 08:46:04 2014 +0000
tree 691f393705f4aa8b6e2476817e1046f6e572efca
parent 45170bcb5e3b5e076e9307c695faf25faac395c8

shill: Fix most of warnings from cpplint

Fix most cpplinter's warnings. On a few occasisions, the warnings
produced were false-positives, so added explicit // NOLINT comment
overrides.

There were a few instances of disallowed non-const reference usage
(reported as runtime/reference error by cpplint) for
"DBus::Error &error" which should potentially be changed
to pointers to comply with C++ coding style but I will let Shill
owners do that since there is quite a few of those and the
change isn't brain-dead simple...

BUG=None
TEST=platform2 still compiles and all unit tests pass.

Change-Id: Ic2e31896aa13d20eeb1a85dee74f3db8cccfde2e
Reviewed-on: https://chromium-review.googlesource.com/204164
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

routing_table_unittest.cc

diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index d9391de..3abdcd1 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -24,7 +24,6 @@
 using base::Bind;
 using base::Callback;
 using base::Unretained;
-using base::hash_map;
 using std::deque;
 using std::vector;
 using testing::_;
@@ -59,7 +58,7 @@
     RTNLHandler::GetInstance()->Stop();
   }
 
-  hash_map<int, vector<RoutingTableEntry> > *GetRoutingTables() {
+  std::unordered_map<int, vector<RoutingTableEntry>> *GetRoutingTables() {
     return &routing_table_->tables_;
   }
 
@@ -289,8 +288,8 @@
                  kTestDeviceIndex0,
                  entry0);
 
-  hash_map<int, vector<RoutingTableEntry> > *tables =
-    GetRoutingTables();
+  std::unordered_map<int, vector<RoutingTableEntry>> *tables =
+      GetRoutingTables();
 
   // We should have a single table, which should in turn have a single entry.
   EXPECT_EQ(1, tables->size());
@@ -605,7 +604,8 @@
                                 kTestRequestSeq,
                                 RTPROT_UNSPEC);
 
-  hash_map<int, vector<RoutingTableEntry> > *tables = GetRoutingTables();
+  std::unordered_map<int, vector<RoutingTableEntry>> *tables =
+      GetRoutingTables();
 
   // We should have a single table, which should in turn have a single entry.
   EXPECT_EQ(1, tables->size());