commit a0ddf46e466bd4ba3d20952f0a6988c680c1af14
author Ben Chan <benchan@chromium.org> Thu Feb 06 11:32:42 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Apr 10 01:17:26 2014 +0000
tree e336ce7569c01ac171338e7e935e69aee3443168
parent 3ff527c8b5ab153016b7d86a1cf3be2e3e6c97c8

shill: Update to build against libchrome-242728.

BUG=chromium:341521
CQ-DEPEND=CL:193660
TEST=Tested the following:
1. `FEATURES=test USE='cellular wimax' emerge-$BOARD platform2`
2. Run the following tests:
   - network_3GSmokeTest
   - network_VPNConnect.*
   - network_WiMaxSmoke
   - wifi_matfunc

Change-Id: Ic1553c182ab7a833a68c45f012f646b8930cb095
Reviewed-on: https://chromium-review.googlesource.com/193606
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

hook_table_unittest.cc

diff --git a/hook_table_unittest.cc b/hook_table_unittest.cc
index 0b60970..bc280f7 100644
--- a/hook_table_unittest.cc
+++ b/hook_table_unittest.cc
@@ -8,15 +8,15 @@
 
 #include <base/bind.h>
 #include <base/callback.h>
-#include <base/message_loop.h>
+#include <base/message_loop/message_loop.h>
 
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/testing.h"
 
+using base::Bind;
 using base::Callback;
 using base::Closure;
-using base::Bind;
 using base::Unretained;
 using std::string;
 using ::testing::_;
@@ -37,7 +37,7 @@
   HookTableTest()
       : hook_table_(&event_dispatcher_) {}
 
-  base::Callback<void(const Error &)> *GetDoneCallback() {
+  Callback<void(const Error &)> *GetDoneCallback() {
     return &hook_table_.done_cb_;
   }
 
@@ -95,7 +95,7 @@
   hook_table_.Run(kTimeout, done_cb);
 
   // Cause the event dispatcher to exit after kTimeout + 1 ms.
-  event_dispatcher_.PostDelayedTask(MessageLoop::QuitClosure(),
+  event_dispatcher_.PostDelayedTask(base::MessageLoop::QuitClosure(),
                                     kTimeout + 1);
   event_dispatcher_.DispatchForever();
   EXPECT_TRUE(GetDoneCallback()->is_null());
@@ -147,7 +147,7 @@
   hook_table_.ActionComplete(kName1);
   hook_table_.ActionComplete(kName3);
   // Cause the event dispatcher to exit after kTimeout + 1 ms.
-  event_dispatcher_.PostDelayedTask(MessageLoop::QuitClosure(),
+  event_dispatcher_.PostDelayedTask(base::MessageLoop::QuitClosure(),
                                     kTimeout + 1);
   event_dispatcher_.DispatchForever();
 }