base::Bind: Convert ServiceProcessControl::CloudPrintProxyInfoHandler.

chrome/browser/service/service_process_control.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
 #define CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
 
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/callback_old.h"
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/process.h"
 #include "base/task.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ipc/ipc_channel_proxy.h"
 
 class CommandLine;
@@ skipping 11 matching lines @@
 // THREADING
 //
 // This class is accessed on the UI thread through some UI actions. It then
 // talks to the IPC channel on the IO thread.
 class ServiceProcessControl : public IPC::Channel::Sender,
                               public IPC::Channel::Listener,
                               public content::NotificationObserver {
  public:
   typedef IDMap<ServiceProcessControl>::iterator iterator;
   typedef std::queue<IPC::Message> MessageQueue;
-  typedef Callback1<const cloud_print::CloudPrintProxyInfo&>::Type
+  typedef base::Callback<void(const cloud_print::CloudPrintProxyInfo&)>
       CloudPrintProxyInfoHandler;
 
   // Returns the singleton instance of this class.
   static ServiceProcessControl* GetInstance();
   // Return true if this object is connected to the service.
   bool is_connected() const { return channel_.get() != NULL; }
 
   // If no service process is currently running, creates a new service process
   // and connects to it. If a service process is already running this method
   // will try to connect to it.
@@ skipping 28 matching lines @@
       const cloud_print::CloudPrintProxyInfo& proxy_info);
 
   // Send a shutdown message to the service process. IPC channel will be
   // destroyed after calling this method.
   // Return true if the message was sent.
   bool Shutdown();
 
   // Send request for cloud print proxy info (enabled state, email, proxy id).
   // The callback gets the information when received.
   bool GetCloudPrintProxyInfo(
-      CloudPrintProxyInfoHandler* cloud_print_status_callback);
+      const CloudPrintProxyInfoHandler& cloud_print_status_callback);
 
  private:
   // This class is responsible for launching the service process on the
   // PROCESS_LAUNCHER thread.
   class Launcher
       : public base::RefCountedThreadSafe<ServiceProcessControl::Launcher> {
    public:
     Launcher(ServiceProcessControl* process, CommandLine* cmd_line);
     // Execute the command line to start the process asynchronously.
     // After the comamnd is executed |task| is called with the process handle on
@@ skipping 43 matching lines @@
   // Service process launcher.
   scoped_refptr<Launcher> launcher_;
 
   // Callbacks that get invoked when the channel is successfully connected.
   TaskList connect_success_tasks_;
   // Callbacks that get invoked when there was a connection failure.
   TaskList connect_failure_tasks_;
 
   // Callback that gets invoked when a status message is received from
   // the cloud print proxy.
-  scoped_ptr<CloudPrintProxyInfoHandler> cloud_print_info_callback_;
+  CloudPrintProxyInfoHandler cloud_print_info_callback_;
 
   content::NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_