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

Unified Diff: device/test/usb_test_gadget_impl.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
Index: device/test/usb_test_gadget_impl.cc
diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc
index 0222ab32f5714348ae41422781c3c9273f5d70fd..0d88d57661d916707be5bc362f856d7c8dbff602 100644
--- a/device/test/usb_test_gadget_impl.cc
+++ b/device/test/usb_test_gadget_impl.cc
@@ -143,8 +143,13 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
// net::URLRequestContextGetter implementation
net::URLRequestContext* GetURLRequestContext() override {
- context_builder_.set_proxy_service(net::ProxyService::CreateDirect());
- return context_builder_.Build();
+ if (!context_) {
+ net::URLRequestContextBuilder context_builder;
+ context_builder.set_proxy_service(
+ make_scoped_ptr(net::ProxyService::CreateDirect()));
+ context_ = context_builder.Build().Pass();
+ }
+ return context_.get();
}
scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
@@ -152,7 +157,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
return network_task_runner_;
}
- net::URLRequestContextBuilder context_builder_;
+ scoped_ptr<net::URLRequestContext> context_;
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
};
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc ('k') | mojo/services/network/network_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698