Merge 54867 - ChromeFrame currently overrides the request context for interce...

chrome/browser/automation/automation_resource_message_filter.h

Index: chrome/browser/automation/automation_resource_message_filter.h
===================================================================
--- chrome/browser/automation/automation_resource_message_filter.h	(revision 56788)
+++ chrome/browser/automation/automation_resource_message_filter.h	(working copy)
@@ -13,6 +13,7 @@
 #include "base/platform_thread.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "net/base/completion_callback.h"
+#include "net/base/cookie_store.h"
 
 class URLRequestAutomationJob;
 class GURL;
@@ -40,12 +41,23 @@
         is_pending_render_view(pending_view) {
     }
 
+    void set_cookie_store(net::CookieStore* cookie_store) {
+      cookie_store_ = cookie_store;
+    }
+
+    net::CookieStore* cookie_store() {
+      return cookie_store_.get();
+    }
+
     int tab_handle;
     int ref_count;
     scoped_refptr<AutomationResourceMessageFilter> filter;
     // Indicates whether network requests issued by this render view need to
     // be executed later.
     bool is_pending_render_view;
+
+    // The cookie store associated with this render view.
+    scoped_refptr<net::CookieStore> cookie_store_;
   };
 
   // Create the filter.
@@ -100,10 +112,14 @@
 
   // Retrieves cookies for the url passed in from the external host. The
   // callback passed in is notified on success or failure asynchronously.
-  static void GetCookiesForUrl(int tab_handle, const GURL& url,
-                               net::CompletionCallback* callback,
-                               net::CookieStore* cookie_store);
+  // Returns true on success.
+  static bool GetCookiesForUrl(const GURL& url,
+                               net::CompletionCallback* callback);
 
+  // Sets cookies on the URL in the external host. Returns true on success.
+  static bool SetCookiesForUrl(const GURL& url, const std::string& cookie_line,
+                               net::CompletionCallback* callback);
+
   // This function gets invoked when we receive a response from the external
   // host for the cookie request sent in GetCookiesForUrl above. It sets the
   // cookie temporarily on the cookie store and executes the completion
@@ -112,10 +128,6 @@
   void OnGetCookiesHostResponse(int tab_handle, bool success, const GURL& url,
                                 const std::string& cookies, int cookie_id);
 
-  // Set cookies in the external host.
-  static void SetCookiesForUrl(int tab_handle, const GURL&url,
-    const std::string& cookie_line, net::CompletionCallback* callback);
-
  protected:
   // Retrieves the automation request id for the passed in chrome request
   // id and returns it in the automation_request_id parameter.