| Index: chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
|
| index 2f088a128b88eb26e7145f68f889e6c4ac1d53e3..776ef82478fe20e69822cb3758c45b736b08b6ee 100644
|
| --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
|
| @@ -8,7 +8,7 @@
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "base/callback.h"
|
| +#include "base/bind.h"
|
| #include "base/file_util.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| @@ -523,13 +523,13 @@ void MobileSetupHandler::HandleSetTransactionStatus(const ListValue* args) {
|
| return;
|
| scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(), status);
|
| BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - NewRunnableMethod(task.get(), &TaskProxy::HandleSetTransactionStatus));
|
| + base::Bind(&TaskProxy::HandleSetTransactionStatus, task.get()));
|
| }
|
|
|
| void MobileSetupHandler::InitiateActivation() {
|
| scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(), 0);
|
| BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - NewRunnableMethod(task.get(), &TaskProxy::HandleStartActivation));
|
| + base::Bind(&TaskProxy::HandleStartActivation, task.get()));
|
| }
|
|
|
| void MobileSetupHandler::StartActivation() {
|
| @@ -680,8 +680,7 @@ bool MobileSetupHandler::ConnectToNetwork(
|
| scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(),
|
| delay);
|
| BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
|
| - NewRunnableMethod(task.get(), &TaskProxy::ContinueConnecting),
|
| - delay);
|
| + base::Bind(&TaskProxy::ContinueConnecting, task.get()), delay);
|
| return false;
|
| }
|
| chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
|
| @@ -705,8 +704,7 @@ void MobileSetupHandler::ForceReconnect(
|
| scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(),
|
| delay);
|
| BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
|
| - NewRunnableMethod(task.get(), &TaskProxy::ContinueConnecting),
|
| - delay);
|
| + base::Bind(&TaskProxy::ContinueConnecting, task.get()), delay);
|
| }
|
|
|
| bool MobileSetupHandler::ConnectionTimeout() {
|
| @@ -1100,8 +1098,7 @@ void MobileSetupHandler::ChangeState(chromeos::CellularNetwork* network,
|
| UMA_HISTOGRAM_COUNTS("Cellular.RetryOTASP", 1);
|
| scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr(), 0);
|
| BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
|
| - NewRunnableMethod(task.get(), &TaskProxy::RetryOTASP),
|
| - kOTASPRetryDelay);
|
| + base::Bind(&TaskProxy::RetryOTASP, task.get()), kOTASPRetryDelay);
|
| break;
|
| }
|
| case PLAN_ACTIVATION_INITIATING_ACTIVATION:
|
|
|