| Index: chrome/browser/service/service_process_control_browsertest.cc
|
| diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
|
| index 4a373672d2eca60af7dad1d8751507fff171ed40..84393e5fbcfa30d4ebddca90c78d89293f867f43 100644
|
| --- a/chrome/browser/service/service_process_control_browsertest.cc
|
| +++ b/chrome/browser/service/service_process_control_browsertest.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/bind.h"
|
| -#include "base/callback.h"
|
| +#include "base/bind_helpers.h"
|
| #include "base/process_util.h"
|
| #include "base/test/test_timeouts.h"
|
| #include "chrome/browser/service/service_process_control.h"
|
| @@ -26,7 +26,7 @@ class ServiceProcessControlBrowserTest
|
|
|
| #if defined(OS_MACOSX)
|
| virtual void TearDown() {
|
| - // ForceServiceProcessShutdown removes the process from launchd on Mac.
|
| + // ForceServiceProcessShutdown removes the process from launched on Mac.
|
| ForceServiceProcessShutdown("", 0);
|
| }
|
| #endif // OS_MACOSX
|
| @@ -47,8 +47,9 @@ class ServiceProcessControlBrowserTest
|
|
|
| // Send a Cloud Print status request and wait for a reply from the service.
|
| void SendRequestAndWait() {
|
| - ServiceProcessControl::GetInstance()->GetCloudPrintProxyInfo(NewCallback(
|
| - this, &ServiceProcessControlBrowserTest::CloudPrintInfoCallback));
|
| + ServiceProcessControl::GetInstance()->GetCloudPrintProxyInfo(
|
| + base::Bind(&ServiceProcessControlBrowserTest::CloudPrintInfoCallback,
|
| + base::Unretained(this)));
|
| ui_test_utils::RunMessageLoop();
|
| }
|
|
|
|
|