chrome/browser/io_thread.cc - Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/io_thread.cc

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mmenke initial review Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/browser/net/aw_url_request_context_getter.cc ('k') | chrome/browser/net/proxy_service_factory.h » ('j') | chrome/browser/net/proxy_service_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/io_thread.cc

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc

index 626e81b83580cce4cf7f8dbda86cb8b82fe625f6..c7bf17ebd20a9fe6f11f617c857dfaa5c35e1bf0 100644

--- a/chrome/browser/io_thread.cc

+++ b/chrome/browser/io_thread.cc

@@ -1070,9 +1070,8 @@ void IOThread::InitSystemRequestContext() {

// If we're in unit_tests, IOThread may not be run.

if (!BrowserThread::IsMessageLoopValid(BrowserThread::IO))

return;

- system_proxy_config_service_.reset(

- ProxyServiceFactory::CreateProxyConfigService(

- pref_proxy_config_tracker_.get()));

+ system_proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(

+ pref_proxy_config_tracker_.get());

system_url_request_context_getter_ =

new SystemURLRequestContextGetter(this);

// Safe to post an unretained this pointer, since IOThread is

@@ -1094,7 +1093,7 @@ void IOThread::InitSystemRequestContextOnIOThread() {

globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService(

net_log_, globals_->proxy_script_fetcher_context.get(),

globals_->system_network_delegate.get(),

- system_proxy_config_service_.release(), command_line,

+ system_proxy_config_service_.Pass(), command_line,

quick_check_enabled_.GetValue());

globals_->system_request_context.reset(