Make UrlRequestContextBuilder take scoped_ptr's

device/test/usb_test_gadget_impl.cc

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 26a318f39ee8ffdfb71bdddab782b0f63c20598b..7d227eabf15e1036b00ae5f51fa4335b022d7344 100644
--- a/device/test/usb_test_gadget_impl.cc
+++ b/device/test/usb_test_gadget_impl.cc
@@ -142,8 +142,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();

[mmenke, 2015/08/20 15:51:07]

Erm...Wow.

+    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()
@@ -151,7 +156,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_;
 };