commit bf76367cd82e6eac86993ce852286a7c36d755bf
author Ningyuan Wang <nywang@google.com> Tue Feb 02 22:57:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 02 22:57:52 2016 +0000
tree 3a2b0fcf6b38b8ace7b24e93ae5a33fc5bdd2a17
parent 54578f418a10876e2436c60d7995e96a333aac31
parent b5c518a86451f34c3ff32f65471ebe4a14749281

Merge "DHCPMessage: change the return type of InitRequest()"

daemon.cc

diff --git a/daemon.cc b/daemon.cc
index 195a5e2..ba3f1fd 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -19,7 +19,6 @@
 #include <sysexits.h>
 
 #include <base/logging.h>
-#include <base/message_loop/message_loop_proxy.h>
 #include <base/run_loop.h>
 
 namespace dhcp_client {

message_loop_event_dispatcher.cc

diff --git a/message_loop_event_dispatcher.cc b/message_loop_event_dispatcher.cc
index 26fcced..095429e 100644
--- a/message_loop_event_dispatcher.cc
+++ b/message_loop_event_dispatcher.cc
@@ -17,7 +17,7 @@
 #include "dhcp_client/message_loop_event_dispatcher.h"
 
 #include <base/location.h>
-#include <base/message_loop/message_loop_proxy.h>
+#include <base/message_loop/message_loop.h>
 #include <base/time/time.h>
 
 namespace dhcp_client {
@@ -26,13 +26,19 @@
 MessageLoopEventDispatcher::~MessageLoopEventDispatcher() {}
 
 bool MessageLoopEventDispatcher::PostTask(const base::Closure& task) {
-  return base::MessageLoopProxy::current()->PostTask(FROM_HERE, task);
+  if (!base::MessageLoop::current())
+    return false;
+  base::MessageLoop::current()->PostTask(FROM_HERE, task);
+  return true;
 }
 
 bool MessageLoopEventDispatcher::PostDelayedTask(const base::Closure& task,
                                                  int64_t delay_ms) {
-  return base::MessageLoopProxy::current()->PostDelayedTask(
+  if (!base::MessageLoop::current())
+    return false;
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, task, base::TimeDelta::FromMilliseconds(delay_ms));
+  return true;
 }
 
 }  // namespace dhcp_client