make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

content/browser/resolve_proxy_msg_helper_unittest.cc

 // Copyright (c) 2011 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 "content/browser/resolve_proxy_msg_helper.h"
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_test_sink.h"
 #include "net/base/net_errors.h"
@@ skipping 41 matching lines @@
                   const std::string& proxy_list)
         : result(result), proxy_list(proxy_list) {
     }
 
     bool result;
     std::string proxy_list;
   };
 
   ResolveProxyMsgHelperTest()
       : resolver_factory_(new net::MockAsyncProxyResolverFactory(false)),
-        service_(new net::ProxyService(new MockProxyConfigService,
-                                       make_scoped_ptr(resolver_factory_),
-                                       NULL)),
+        service_(
+            new net::ProxyService(make_scoped_ptr(new MockProxyConfigService),
+                                  make_scoped_ptr(resolver_factory_),
+                                  NULL)),
         helper_(new TestResolveProxyMsgHelper(service_.get(), this)),
         io_thread_(BrowserThread::IO, &message_loop_) {
     test_sink_.AddFilter(this);
   }
 
  protected:
   const PendingResult* pending_result() const { return pending_result_.get(); }
 
   void clear_pending_result() {
     pending_result_.reset();
@@ skipping 181 matching lines @@
 
   EXPECT_EQ(0u, resolver_.pending_requests().size());
 
   EXPECT_TRUE(pending_result() == NULL);
 
   // It should also be the case that msg1, msg2, msg3 were deleted by the
   // cancellation. (Else will show up as a leak in Valgrind).
 }
 
 }  // namespace content