Clean up Automation and Chrome Frame IPC code.-only use routed messages when needed-use routing IDs to avoid manually unpacking messages-remove data structures from IPC namespace (that should only be used for IPC code, and param traits)Note that I temporarily commented out part of a test in external_tab_test.cc because I couldn't figure out how to get the updated gmock macros to compile.

Review URL: http://codereview.chromium.org/5998006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70105 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 11 deletions

diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index 58d9fefa..4ba65e2 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -98,7 +98,7 @@ class AutomationMockDelegate
     QuitMessageLoop();
   }
 
-  virtual void OnLoad(int tab_handle, const GURL& url) {
+  virtual void OnLoad(const GURL& url) {
     if (url_ == url) {
       navigation_result_ = true;
     } else {
@@ -169,8 +169,8 @@ class AutomationMockNavigate
       : 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();
   }
 };
@@ -187,14 +187,13 @@ class AutomationMockPostMessage
   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;
@@ -220,13 +219,13 @@ class AutomationMockHostNetworkRequestStart
   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_;