Make UrlRequestContextBuilder take scoped_ptr's

chrome/test/chromedriver/net/url_request_context_getter.cc

Index: chrome/test/chromedriver/net/url_request_context_getter.cc
diff --git a/chrome/test/chromedriver/net/url_request_context_getter.cc b/chrome/test/chromedriver/net/url_request_context_getter.cc
index 18d6fb040cb8d4d04604d2ee9c7abef43337f8e7..2d7b47c8a28ec80b1bf46c391ee8f8b5bcc454c8 100644
--- a/chrome/test/chromedriver/net/url_request_context_getter.cc
+++ b/chrome/test/chromedriver/net/url_request_context_getter.cc
@@ -22,9 +22,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     // net::HttpServer fails to parse headers if user-agent header is blank.
     builder.set_user_agent("chromedriver");
     builder.DisableHttpCache();
-    builder.set_proxy_config_service(
-        new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()));
-    url_request_context_.reset(builder.Build());
+    builder.set_proxy_config_service(make_scoped_ptr(
+        new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect())));
+    url_request_context_ = builder.Build().Pass();
   }
   return url_request_context_.get();
 }