Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: remoting/base/url_request_context_getter.cc

Issue 1303493002: Make UrlRequestContextBuilder take scoped_ptr's (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync and fix tiny resulting build failure Created 5 years, 4 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 | « remoting/base/url_request_context_getter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/url_request_context_getter.cc
diff --git a/remoting/base/url_request_context_getter.cc b/remoting/base/url_request_context_getter.cc
index 4c9c2728c63ec3f5d81baf7a2a92bc5ea416c4c5..b527481943dfdc860a8681bd2b56b6639fb35b10 100644
--- a/remoting/base/url_request_context_getter.cc
+++ b/remoting/base/url_request_context_getter.cc
@@ -25,10 +25,11 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
if (!url_request_context_.get()) {
net::URLRequestContextBuilder builder;
builder.SetFileTaskRunner(file_task_runner_);
- builder.set_net_log(new VlogNetLog());
+ net_log_.reset(new VlogNetLog());
+ builder.set_net_log(net_log_.get());
builder.DisableHttpCache();
- builder.set_proxy_config_service(proxy_config_service_.release());
- url_request_context_.reset(builder.Build());
+ builder.set_proxy_config_service(proxy_config_service_.Pass());
+ url_request_context_ = builder.Build().Pass();
}
return url_request_context_.get();
}
« no previous file with comments | « remoting/base/url_request_context_getter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698