diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 18:23:05 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 18:23:05 +0000 |
| commit | a8030a22c88436615550267e26b539382dd5fe8b (patch) | |
| tree | d25b01d04058e18309329edef8cfb1d059690429 /content/browser/loader | |
| parent | 26ca33d393dbd3d3b8763d1659f906f52d2e0289 (diff) | |
| download | chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.zip chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.tar.gz chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.tar.bz2 | |
Revert 256579 "Allow the content browser client to specify a spe..."
This broke the Android builders. The try-bots on the CL did point
out the compile errors, but it was committed manually anyway. Logs:
http://build.chromium.org/p/chromium.linux/builders/Android%20Clang%20Builder%20%28dbg%29/builds/30977/steps/compile/logs/stdio
> Allow the content browser client to specify a special cookie store to be
> used for a given render process id. This special cookie store will then
> be used for renderer messages pertaining to cookies, url fetches in net,
> and websockets. If the special cookie store is NULL, a default cookie store
> will be used.
>
> R=erikwright@chromium.org, jam@chromium.org, lambroslambrou@chromium.org, mmenke@chromium.org, tyoshino@chromium.org
>
> Review URL: https://codereview.chromium.org/188693003
TBR=tburkard@chromium.org
Review URL: https://codereview.chromium.org/197463003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 12 | ||||
| -rw-r--r-- | content/browser/loader/resource_scheduler_unittest.cc | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 0058a24..94899d5 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1056,12 +1056,9 @@ void ResourceDispatcherHostImpl::BeginRequest( } // Construct the request. - net::CookieStore* cookie_store = - GetContentClient()->browser()->OverrideCookieStoreForRenderProcess( - child_id); scoped_ptr<net::URLRequest> new_request; new_request = request_context->CreateRequest( - request_data.url, request_data.priority, NULL, cookie_store); + request_data.url, request_data.priority, NULL); new_request->set_method(request_data.method); new_request->set_first_party_for_cookies( @@ -1362,13 +1359,8 @@ void ResourceDispatcherHostImpl::BeginSaveFile( return; } - net::CookieStore* cookie_store = - GetContentClient()->browser()->OverrideCookieStoreForRenderProcess( - child_id); scoped_ptr<net::URLRequest> request( - request_context->CreateRequest(url, net::DEFAULT_PRIORITY, NULL, - cookie_store)); - + request_context->CreateRequest(url, net::DEFAULT_PRIORITY, NULL)); request->set_method("GET"); SetReferrerForRequest(request.get(), referrer); diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index 2408e3a..d248b4a 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -139,7 +139,7 @@ class ResourceSchedulerTest : public testing::Test { net::RequestPriority priority, int route_id) { scoped_ptr<net::URLRequest> url_request( - context_.CreateRequest(GURL(url), priority, NULL, NULL)); + context_.CreateRequest(GURL(url), priority, NULL)); ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( PROCESS_TYPE_RENDERER, // process_type kChildId, // child_id |