Clean up Automation and Chrome Frame IPC code.

chrome_frame/test/chrome_frame_automation_mock.h

 // Copyright (c) 2006-2009 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_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 80 matching lines @@
       is_connected_ = true;
     } else {
       NOTREACHED();
     }
   }
 
   virtual void OnAutomationServerLaunchFailed() {
     QuitMessageLoop();
   }
 
-  virtual void OnLoad(int tab_handle, const GURL& url) {
+  virtual void OnLoad(const GURL& url) {
     if (url_ == url) {
       navigation_result_ = true;
     } else {
       QuitMessageLoop();
     }
   }
 
   virtual void OnLoadFailed(int error_code, const std::string& url) {
     navigation_result_ = false;
     QuitMessageLoop();
@@ skipping 50 matching lines @@
 
 class AutomationMockNavigate
     : public AutomationMockDelegate<AutomationMockNavigate> {
  public:
   typedef AutomationMockDelegate<AutomationMockNavigate> Base;
   AutomationMockNavigate(MessageLoop* caller_message_loop,
                          int launch_timeout)
       : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
              false) {
   }
-  virtual void OnLoad(int tab_handle, const GURL& url) {
-    Base::OnLoad(tab_handle, url);
+  virtual void OnLoad(const GURL& url) {
+    Base::OnLoad(url);
     QuitMessageLoop();
   }
 };
 
 class AutomationMockPostMessage
     : public AutomationMockDelegate<AutomationMockPostMessage> {
  public:
   typedef AutomationMockDelegate<AutomationMockPostMessage> Base;
   AutomationMockPostMessage(MessageLoop* caller_message_loop,
                             int launch_timeout)
       : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
              false),
         postmessage_result_(false) {}
   bool postmessage_result() const {
     return postmessage_result_;
   }
-  virtual void OnLoad(int tab_handle, const GURL& url) {
-    Base::OnLoad(tab_handle, url);
+  virtual void OnLoad(const GURL& url) {
+    Base::OnLoad(url);
     if (navigation_result()) {
       automation()->ForwardMessageFromExternalHost("Test", "null", "*");
     }
   }
-  virtual void OnMessageFromChromeFrame(int tab_handle,
-                                        const std::string& message,
+  virtual void OnMessageFromChromeFrame(const std::string& message,
                                         const std::string& origin,
                                         const std::string& target) {
     postmessage_result_ = true;
     QuitMessageLoop();
   }
  private:
   bool postmessage_result_;
 };
 
 class AutomationMockHostNetworkRequestStart
     : public AutomationMockDelegate<AutomationMockHostNetworkRequestStart> {
  public:
   typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base;
   AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop,
       int launch_timeout)
       : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
              false),
         request_start_result_(false) {
     if (automation()) {
       automation()->set_use_chrome_network(false);
     }
   }
   bool request_start_result() const {
     return request_start_result_;
   }
-  virtual void OnRequestStart(int tab_handle, int request_id,
-                              const IPC::AutomationURLRequest& request) {
+  virtual void OnRequestStart(int request_id,
+                              const AutomationURLRequest& request) {
     request_start_result_ = true;
     QuitMessageLoop();
   }
-  virtual void OnLoad(int tab_handle, const GURL& url) {
-    Base::OnLoad(tab_handle, url);
+  virtual void OnLoad(const GURL& url) {
+    Base::OnLoad(url);
   }
  private:
   bool request_start_result_;
 };
 
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_