Clean up Automation and Chrome Frame IPC code.

chrome/browser/automation/url_request_automation_job.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.
 // This class simulates what wininet does when a dns lookup fails.
 
 #ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
 #pragma once
 
 #include "base/task.h"
 #include "chrome/common/ref_counted_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
 class AutomationResourceMessageFilter;
+struct AutomationURLResponse;
 
 namespace net {
 class HttpResponseHeaders;
 class HttpResponseInfo;
 }
 
 namespace IPC {
 class Message;
-struct AutomationURLResponse;
 }
 
 // net::URLRequestJob implementation that loads the resources using
 // automation.
 class URLRequestAutomationJob : public net::URLRequestJob {
  public:
   URLRequestAutomationJob(net::URLRequest* request, int tab, int request_id,
                           AutomationResourceMessageFilter* filter,
                           bool is_pending);
 
@@ skipping 39 matching lines @@
 
  protected:
   // Protected net::URLRequestJob override.
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read);
 
   void StartAsync();
   void Cleanup();
   void DisconnectFromMessageFilter();
 
   // IPC message handlers.
-  void OnRequestStarted(int tab, int id,
-      const IPC::AutomationURLResponse& response);
-  void OnDataAvailable(int tab, int id, const std::string& bytes);
-  void OnRequestEnd(int tab, int id, const URLRequestStatus& status);
+  void OnRequestStarted(int id, const AutomationURLResponse& response);
+  void OnDataAvailable(int id, const std::string& bytes);
+  void OnRequestEnd(int id, const URLRequestStatus& status);
 
  private:
   virtual ~URLRequestAutomationJob();
 
   // Task which is scheduled in the URLRequestAutomationJob::ReadRawData
   // function, which completes the job.
   void NotifyJobCompletionTask();
 
   int id_;
   int tab_;
@@ skipping 24 matching lines @@
   // Contains the request status code, which is eventually passed  to the http
   // stack when we receive a Read request for a completed job.
   URLRequestStatus request_status_;
 
   ScopedRunnableMethodFactory<URLRequestAutomationJob> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestAutomationJob);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_