Clean up Automation and Chrome Frame IPC code.

chrome_frame/plugin_url_request.h

 // Copyright (c) 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_PLUGIN_URL_REQUEST_H_
 #define CHROME_FRAME_PLUGIN_URL_REQUEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 50 matching lines @@
     READ_REQUEST_THREADSAFE      = 0x04,
     DOWNLOAD_REQUEST_THREADSAFE  = 0x08,
     COOKIE_REQUEST_THREADSAFE    = 0x10
   };
   virtual ThreadSafeFlags GetThreadSafeFlags() = 0;
 
   // These are called directly from Automation Client when network related
   // 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);
   }
 
   void StopAllRequests() {
     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);
   }
 
  protected:
   PluginUrlRequestDelegate* delegate_;
   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;
   virtual void StopAll() = 0;
   virtual void GetCookiesForUrl(const GURL& url, int cookie_id) = 0;
   virtual void SetCookiesForUrl(const GURL& url, const std::string& cookie) = 0;
 };
 
 // Used as base class. Holds Url request properties (url, method, referrer..)
 class PluginUrlRequest {
@@ skipping 60 matching lines @@
   std::string url_;
   std::string method_;
   std::string referrer_;
   std::string extra_headers_;
   ResourceType::Type resource_type_;
   int load_flags_;
   ScopedComPtr<IStream> upload_data_;
 };
 
 #endif  // CHROME_FRAME_PLUGIN_URL_REQUEST_H_