base::Bind: Convert ServiceProcessControl::CloudPrintProxyInfoHandler.

chrome/browser/service/service_process_control_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 class ServiceProcessControlBrowserTest
     : public InProcessBrowserTest {
  public:
   ServiceProcessControlBrowserTest()
       : service_process_handle_(base::kNullProcessHandle) {
   }
   ~ServiceProcessControlBrowserTest() {
     base::CloseProcessHandle(service_process_handle_);
     service_process_handle_ = base::kNullProcessHandle;
   }
 
 #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
 
  protected:
   void LaunchServiceProcessControl() {
     // Launch the process asynchronously.
     ServiceProcessControl::GetInstance()->Launch(
         base::Bind(&ServiceProcessControlBrowserTest::ProcessControlLaunched,
                    this),
         base::Bind(
             &ServiceProcessControlBrowserTest::ProcessControlLaunchFailed,
             this));
 
     // Then run the message loop to keep things running.
     ui_test_utils::RunMessageLoop();
   }
 
   // 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();
   }
 
   void CloudPrintInfoCallback(
       const cloud_print::CloudPrintProxyInfo& proxy_info) {
     MessageLoop::current()->Quit();
   }
 
   void Disconnect() {
     // This will close the IPC connection.
@@ skipping 135 matching lines @@
   EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid));
   // Launch the service process.
   LaunchServiceProcessControl();
   EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
   EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
   // Disconnect from service process.
   ServiceProcessControl::GetInstance()->Disconnect();
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest);