Shift URLRequestContextStorage over to taking scoped_ptrs.

chrome/browser/net/predictor_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 <time.h>
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 
@@ skipping 773 matching lines @@
 }
 
 TEST_F(PredictorTest, ProxyDefinitelyEnabled) {
   // Don't actually try to resolve names.
   Predictor::set_max_parallel_resolves(0);
 
   Predictor testing_master(true, true);
 
   net::ProxyConfig config;
   config.proxy_rules().ParseFromString("http=socks://localhost:12345");
-  testing_master.proxy_service_ = net::ProxyService::CreateFixed(config);
+  scoped_ptr<net::ProxyService> proxy_service(
+      net::ProxyService::CreateFixed(config));
+  testing_master.proxy_service_ = proxy_service.get();
 
   GURL goog("http://www.google.com:80");
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
 
   // Proxy is definitely in use, so there is no need to pre-resolve the domain.
   EXPECT_TRUE(testing_master.work_queue_.IsEmpty());
 
-  delete testing_master.proxy_service_;
   testing_master.Shutdown();
 }
 
 TEST_F(PredictorTest, ProxyDefinitelyNotEnabled) {
   // Don't actually try to resolve names.
   Predictor::set_max_parallel_resolves(0);
 
   Predictor testing_master(true, true);
   net::ProxyConfig config = net::ProxyConfig::CreateDirect();
-  testing_master.proxy_service_ = net::ProxyService::CreateFixed(config);
+  scoped_ptr<net::ProxyService> proxy_service(
+      net::ProxyService::CreateFixed(config));
+  testing_master.proxy_service_ = proxy_service.get();
 
   GURL goog("http://www.google.com:80");
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
 
   // Proxy is not in use, so the name has been registered for pre-resolve.
   EXPECT_FALSE(testing_master.work_queue_.IsEmpty());
 
-  delete testing_master.proxy_service_;
   testing_master.Shutdown();
 }
 
 TEST_F(PredictorTest, ProxyMaybeEnabled) {
   // Don't actually try to resolve names.
   Predictor::set_max_parallel_resolves(0);
 
   Predictor testing_master(true, true);
   net::ProxyConfig config = net::ProxyConfig::CreateFromCustomPacURL(GURL(
       "http://foopy/proxy.pac"));
-  testing_master.proxy_service_ = net::ProxyService::CreateFixed(config);
+  scoped_ptr<net::ProxyService> proxy_service(
+      net::ProxyService::CreateFixed(config));
+  testing_master.proxy_service_ = proxy_service.get();
 
   GURL goog("http://www.google.com:80");
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
 
   // Proxy may not be in use (the PAC script has not yet been evaluated), so the
   // name has been registered for pre-resolve.
   EXPECT_FALSE(testing_master.work_queue_.IsEmpty());
 
-  delete testing_master.proxy_service_;
   testing_master.Shutdown();
 }
 
 }  // namespace chrome_browser_net