| Index: trunk/src/content/browser/renderer_host/render_message_filter.h
|
| ===================================================================
|
| --- trunk/src/content/browser/renderer_host/render_message_filter.h (revision 219785)
|
| +++ trunk/src/content/browser/renderer_host/render_message_filter.h (working copy)
|
| @@ -60,12 +60,12 @@
|
| }
|
|
|
| namespace net {
|
| +class URLRequestContext;
|
| class URLRequestContextGetter;
|
| }
|
|
|
| namespace content {
|
| class BrowserContext;
|
| -class CookieStoreMap;
|
| class DOMStorageContextWrapper;
|
| class MediaInternals;
|
| class PluginServiceImpl;
|
| @@ -85,7 +85,6 @@
|
| PluginServiceImpl * plugin_service,
|
| BrowserContext* browser_context,
|
| net::URLRequestContextGetter* request_context,
|
| - const CookieStoreMap& cookie_store_map,
|
| RenderWidgetHelper* render_widget_helper,
|
| media::AudioManager* audio_manager,
|
| MediaInternals* media_internals,
|
| @@ -106,6 +105,11 @@
|
|
|
| int render_process_id() const { return render_process_id_; }
|
|
|
| + // Returns the correct net::URLRequestContext depending on what type of url is
|
| + // given.
|
| + // Only call on the IO thread.
|
| + net::URLRequestContext* GetRequestContextForURL(const GURL& url);
|
| +
|
| private:
|
| friend class BrowserThread;
|
| friend class base::DeleteHelper<RenderMessageFilter>;
|
| @@ -268,12 +272,6 @@
|
| // Contextual information to be used for requests created here.
|
| scoped_refptr<net::URLRequestContextGetter> request_context_;
|
|
|
| - // Map of schemes to the CookieStore instance that services those schemes.
|
| - // We store a clone of the CookieStoreMap passed in the constructor in
|
| - // order to avoid having 2 threads access the same object. Is is assumed
|
| - // that the source map never changes after we make the clone.
|
| - scoped_ptr<CookieStoreMap> cookie_store_map_;
|
| -
|
| // The ResourceContext which is to be used on the IO thread.
|
| ResourceContext* resource_context_;
|
|
|
|
|