Make UrlRequestContextBuilder take scoped_ptr's

net/url_request/url_request_context_builder_unittest.cc

 // Copyright (c) 2012 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 "net/url_request/url_request_context_builder.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_auth_handler.h"
@@ skipping 35 matching lines @@
 };
 
 class URLRequestContextBuilderTest : public PlatformTest {
  protected:
   URLRequestContextBuilderTest()
       : test_server_(SpawnedTestServer::TYPE_HTTP,
                      SpawnedTestServer::kLocalhost,
                      base::FilePath(
                          FILE_PATH_LITERAL("net/data/url_request_unittest"))) {
 #if defined(OS_LINUX) || defined(OS_ANDROID)
-    builder_.set_proxy_config_service(
-        new ProxyConfigServiceFixed(ProxyConfig::CreateDirect()));
+    builder_.set_proxy_config_service(make_scoped_ptr(
+        new ProxyConfigServiceFixed(ProxyConfig::CreateDirect())));
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
   }
 
   SpawnedTestServer test_server_;
   URLRequestContextBuilder builder_;
 };
 
 TEST_F(URLRequestContextBuilderTest, DefaultSettings) {
   ASSERT_TRUE(test_server_.Start());
 
@@ skipping 41 matching lines @@
                 &handler));
   // Verify that a handler isn't returned for a bogus scheme.
   EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
             context->http_auth_handler_factory()->CreateAuthHandlerFromString(
                 "Bogus", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
 }
 
 }  // namespace
 
 }  // namespace net