diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 15:48:53 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 15:48:53 +0000 |
| commit | 9abfa1903f72e0735c9c1ef6570eef94f26eb4a7 (patch) | |
| tree | 0a9cc60eebf84295d1a0dd5896d80f96b9461f75 /content/browser/resolve_proxy_msg_helper.cc | |
| parent | 056f879b0a2a3281818bda56011081a6c683208e (diff) | |
| download | chromium_src-9abfa1903f72e0735c9c1ef6570eef94f26eb4a7.zip chromium_src-9abfa1903f72e0735c9c1ef6570eef94f26eb4a7.tar.gz chromium_src-9abfa1903f72e0735c9c1ef6570eef94f26eb4a7.tar.bz2 | |
Deprecate Profile::GetDefaultRequestContext().
Make it private and establish a friend whitelist for existing users.
BUG=64339
TEST=none
Review URL: http://codereview.chromium.org/7438002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resolve_proxy_msg_helper.cc')
| -rw-r--r-- | content/browser/resolve_proxy_msg_helper.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc index edacad9..80ab29b 100644 --- a/content/browser/resolve_proxy_msg_helper.cc +++ b/content/browser/resolve_proxy_msg_helper.cc @@ -91,7 +91,7 @@ bool ResolveProxyMsgHelper::GetProxyService(net::ProxyService** out) const { // If there is no default request context (say during shut down). net::URLRequestContextGetter* context_getter = - Profile::GetDefaultRequestContext(); + Profile::Deprecated::GetDefaultRequestContext(); if (!context_getter) return false; @@ -104,7 +104,8 @@ ResolveProxyMsgHelper::~ResolveProxyMsgHelper() { // Clear all pending requests if the ProxyService is still alive (if we have a // default request context or override). if (!pending_requests_.empty() && - (Profile::GetDefaultRequestContext() || proxy_service_override_)) { + (Profile::Deprecated::GetDefaultRequestContext() || + proxy_service_override_)) { PendingRequest req = pending_requests_.front(); proxy_service_->CancelPacRequest(req.pac_req); } |