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 /net/proxy | |
| 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 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index 0887d8c..705bbbf 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -135,7 +135,7 @@ int ProxyScriptFetcherImpl::Fetch( } cur_request_ = - url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, NULL); + url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this); cur_request_->set_method("GET"); // Make sure that the PAC script is downloaded using a direct connection, |