Clean up Automation and Chrome Frame IPC code.

chrome/test/automation/automation_proxy.h

 // Copyright (c) 2010 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>
@@ skipping 13 matching lines @@
 #include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sync_channel.h"
 
 class BrowserProxy;
 class ExtensionProxy;
 class TabProxy;
 class WindowProxy;
-
-namespace IPC {
 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 {
  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).
@@ skipping 173 matching lines @@
 
   // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
   // message from AutomationProxy, unpacks the messages and routes that call to
   // the tracker.
   virtual void InvalidateHandle(const IPC::Message& message);
 
   // Creates a tab that can hosted in an external process. The function
   // returns a TabProxy representing the tab as well as a window handle
   // that can be reparented in another process.
   scoped_refptr<TabProxy> CreateExternalTab(
-      const IPC::ExternalTabSettings& settings,
+      const ExternalTabSettings& settings,
       gfx::NativeWindow* external_tab_container,
       gfx::NativeWindow* tab);
 
   int command_execution_timeout_ms() const {
     return static_cast<int>(command_execution_timeout_.InMilliseconds());
   }
 
   // Sets the timeout for subsequent automation calls.
   void set_command_execution_timeout_ms(int timeout_ms) {
     DCHECK(timeout_ms <= 10 * 60 * 1000 ) << "10+ min of automation timeout "
@@ skipping 57 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta command_execution_timeout_;
 
   PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__