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>

shill_daemon.cc

diff --git a/shill_daemon.cc b/shill_daemon.cc
index 9323f76..589e45c 100644
--- a/shill_daemon.cc
+++ b/shill_daemon.cc
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <base/bind.h>
-#include <base/file_path.h>
+#include <base/files/file_path.h>
 
 #include "shill/callback80211_metrics.h"
 #include "shill/dhcp_provider.h"
@@ -76,7 +76,7 @@
       Metrics::kTerminationActionReasonTerminate)) {
     SLOG(Daemon, 1) << "No termination actions were run";
     Stop();
-    dispatcher_.PostTask(MessageLoop::QuitClosure());
+    dispatcher_.PostTask(base::MessageLoop::QuitClosure());
   }
 }
 
@@ -85,7 +85,7 @@
   metrics_->NotifyTerminationActionsCompleted(
       Metrics::kTerminationActionReasonTerminate, error.IsSuccess());
   Stop();
-  dispatcher_.PostTask(MessageLoop::QuitClosure());
+  dispatcher_.PostTask(base::MessageLoop::QuitClosure());
 }
 
 void Daemon::Start() {