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, 9 insertions, 10 deletions

diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h
index 2d25b94..a39cf7d 100644
--- a/chrome_frame/plugin_url_request.h
+++ b/chrome_frame/plugin_url_request.h
@@ -68,20 +68,20 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
   // automation messages are received from Chrome.
   // Strip 'tab' handle and forward to the virtual methods implemented by
   // derived classes.
-  void StartUrlRequest(int tab, int request_id,
-                       const IPC::AutomationURLRequest& request_info) {
+  void StartUrlRequest(int request_id,
+                       const AutomationURLRequest& request_info) {
     StartRequest(request_id, request_info);
   }
 
-  void ReadUrlRequest(int tab, int request_id, int bytes_to_read) {
+  void ReadUrlRequest(int request_id, int bytes_to_read) {
     ReadRequest(request_id, bytes_to_read);
   }
 
-  void EndUrlRequest(int tab, int request_id, const URLRequestStatus& s) {
+  void EndUrlRequest(int request_id, const URLRequestStatus& s) {
     EndRequest(request_id);
   }
 
-  void DownloadUrlRequestInHost(int tab, int request_id) {
+  void DownloadUrlRequestInHost(int request_id) {
     DownloadRequestInHost(request_id);
   }
 
@@ -89,12 +89,11 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
     StopAll();
   }
 
-  void GetCookiesFromHost(int tab_handle, const GURL& url, int cookie_id) {
+  void GetCookiesFromHost(const GURL& url, int cookie_id) {
     GetCookiesForUrl(url, cookie_id);
   }
 
-  void SetCookiesInHost(int tab_handle, const GURL& url,
-                        const std::string& cookie) {
+  void SetCookiesInHost(const GURL& url, const std::string& cookie) {
     SetCookiesForUrl(url, cookie);
   }
 
@@ -103,8 +102,8 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
   bool enable_frame_busting_;
 
  private:
-  virtual void StartRequest(int request_id,
-      const IPC::AutomationURLRequest& request_info) = 0;
+  virtual void StartRequest(
+      int request_id, const AutomationURLRequest& request_info) = 0;
   virtual void ReadRequest(int request_id, int bytes_to_read) = 0;
   virtual void EndRequest(int request_id) = 0;
   virtual void DownloadRequestInHost(int request_id) = 0;