Separate out IPC::Message::Sender and channel::Listener into a separate class.

chrome/browser/service/service_process_control.h

 // Copyright (c) 2012 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/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/process.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ipc/ipc_channel_proxy.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
 
 class CommandLine;
 
 namespace cloud_print {
 struct CloudPrintProxyInfo;
 }  // namespace cloud_print
 
 // A ServiceProcessControl works as a portal between the service process and
 // the browser process.
 //
 // It is used to start and terminate the service process. It is also used
 // to send and receive IPC messages from the service process.
 //
 // 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,
+class ServiceProcessControl : public IPC::Sender,
+                              public IPC::Listener,
                               public content::NotificationObserver {
  public:
   typedef IDMap<ServiceProcessControl>::iterator iterator;
   typedef std::queue<IPC::Message> MessageQueue;
   typedef base::Callback<void(const cloud_print::CloudPrintProxyInfo&)>
       CloudPrintProxyInfoHandler;
 
   // Returns the singleton instance of this class.
   static ServiceProcessControl* GetInstance();
 
@@ skipping 12 matching lines @@
   // Note that if we are already connected to service process then
   // |success_task| can be invoked in the context of the Launch call.
   // Virtual for testing.
   virtual void Launch(const base::Closure& success_task,
                       const base::Closure& failure_task);
 
   // Disconnect the IPC channel from the service process.
   // Virtual for testing.
   virtual void Disconnect();
 
-  // IPC::Channel::Listener implementation.
+  // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
-  // IPC::Channel::Sender implementation
+  // IPC::Sender implementation
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Message handlers
   void OnCloudPrintProxyInfo(
       const cloud_print::CloudPrintProxyInfo& proxy_info);
@@ skipping 76 matching lines @@
   TaskList connect_failure_tasks_;
 
   // Callback that gets invoked when a status message is received from
   // the cloud print proxy.
   CloudPrintProxyInfoHandler cloud_print_info_callback_;
 
   content::NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_