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

chrome/browser/renderer_host/resource_message_filter.h

Index: chrome/browser/renderer_host/resource_message_filter.h
===================================================================
--- chrome/browser/renderer_host/resource_message_filter.h	(revision 56788)
+++ chrome/browser/renderer_host/resource_message_filter.h	(working copy)
@@ -29,6 +29,7 @@
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "ipc/ipc_channel_proxy.h"
+#include "net/base/cookie_store.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 
@@ -85,8 +86,7 @@
                         PluginService* plugin_service,
                         printing::PrintJobManager* print_job_manager,
                         Profile* profile,
-                        RenderWidgetHelper* render_widget_helper,
-                        URLRequestContextGetter* request_context);
+                        RenderWidgetHelper* render_widget_helper);
 
   // IPC::ChannelProxy::MessageFilter methods:
   virtual void OnFilterAdded(IPC::Channel* channel);
@@ -491,6 +491,14 @@
     return render_view_id_;
   }
 
+  void set_cookie_store(net::CookieStore* cookie_store) {
+    cookie_store_ = cookie_store;
+  }
+
+  net::CookieStore* cookie_store() {
+    return cookie_store_.get();
+  }
+
  private:
   GURL url_;
   IPC::Message* reply_msg_;
@@ -499,6 +507,7 @@
   int render_process_id_;
   int render_view_id_;
   bool raw_cookies_;
+  scoped_refptr<net::CookieStore> cookie_store_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RESOURCE_MESSAGE_FILTER_H_