Rename IPC::Channel and IPC::Sender in src/chrome.

chrome/test/automation/automation_proxy.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_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "ipc/ipc_message.h"
+#include "ipc/ipc_sender.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/native_widget_types.h"
 
 class BrowserProxy;
 class TabProxy;
 class WindowProxy;
 struct ExternalTabSettings;
 
 // This is an interface that AutomationProxy-related objects can use to
 // access the message-sending abilities of the Proxy.
-class AutomationMessageSender : public IPC::Message::Sender {
+class AutomationMessageSender : public IPC::Sender {
  public:
   // Sends a message synchronously; it doesn't return until a response has been
   // received or a timeout has expired.
   //
   // The function returns true if a response is received, and returns false if
   // there is a failure or timeout (in milliseconds).
   //
   // NOTE: When timeout occurs, the connection between proxy provider may be
   //       in transit state. Specifically, there might be pending IPC messages,
   //       and the proxy provider might be still working on the previous
   //       request.
   virtual bool Send(IPC::Message* message) = 0;
   virtual bool Send(IPC::Message* message, int timeout_ms) = 0;
 };
 
 // This is the interface that external processes can use to interact with
 // a running instance of the app.
-class AutomationProxy : public IPC::Channel::Listener,
-                        public AutomationMessageSender {
+class AutomationProxy : public IPC::Listener, public AutomationMessageSender {
  public:
   AutomationProxy(int action_timeout_ms, bool disconnect_on_failure);
   virtual ~AutomationProxy();
 
   // Creates a previously unused channel id.
   static std::string GenerateChannelID();
 
   // Initializes a channel for a connection to an AutomationProvider.
   // If use_named_interface is false, it will act as a client
   // and connect to the named IPC socket with channel_id as its path.
@@ skipping 201 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta action_timeout_;
 
   base::PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_