Shift URLRequestContextStorage over to taking scoped_ptrs.

device/test/usb_test_gadget_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/test/usb_test_gadget.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 127 matching lines @@
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
       : network_task_runner_(network_task_runner) {}
 
  private:
   ~URLRequestContextGetter() override {}
 
   // net::URLRequestContextGetter implementation
   net::URLRequestContext* GetURLRequestContext() override {
     if (!context_) {
       net::URLRequestContextBuilder context_builder;
-      context_builder.set_proxy_service(
-          make_scoped_ptr(net::ProxyService::CreateDirect()));
+      context_builder.set_proxy_service(net::ProxyService::CreateDirect());
       context_ = context_builder.Build().Pass();
     }
     return context_.get();
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override {
     return network_task_runner_;
   }
 
@@ skipping 448 matching lines @@
     return false;
   }
 
   DeviceAddListener add_listener(usb_service_, device_address_, -1);
   device_ = add_listener.WaitForAdd();
   DCHECK(device_.get());
   return true;
 }
 
 }  // namespace device