Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_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 "chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 89 matching lines @@
     PolicyServiceImpl::Providers providers;
     providers.push_back(&provider_);
     policy_service_.reset(new PolicyServiceImpl(providers));
 
     empty_network_configs_.reset(new base::ListValue);
     empty_certificates_.reset(new base::ListValue);
 
     scoped_ptr<base::DictionaryValue> fake_toplevel_onc =
         onc::ReadDictionaryFromJson(kFakeONC);
 
-    base::Value* network_configs_value = NULL;
+    scoped_ptr<base::Value> network_configs_value;
     base::ListValue* network_configs = NULL;
     fake_toplevel_onc->RemoveWithoutPathExpansion(
         onc::toplevel_config::kNetworkConfigurations,
         &network_configs_value);
-    network_configs_value->GetAsList(&network_configs);
+    network_configs_value.release()->GetAsList(&network_configs);
     fake_network_configs_.reset(network_configs);
 
-    base::Value* certs_value = NULL;
+    scoped_ptr<base::Value> certs_value;
     base::ListValue* certs = NULL;
     fake_toplevel_onc->RemoveWithoutPathExpansion(
         onc::toplevel_config::kCertificates,
         &certs_value);
-    certs_value->GetAsList(&certs);
+    certs_value.release()->GetAsList(&certs);
     fake_certificates_.reset(certs);
   }
 
   virtual void TearDown() OVERRIDE {
     provider_.Shutdown();
     content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   }
 
   void UpdateProviderPolicy(const PolicyMap& policy) {
     provider_.UpdateChromePolicy(policy);
@@ skipping 275 matching lines @@
   updater.UnsetUserPolicyService();
 }
 
 INSTANTIATE_TEST_CASE_P(
     NetworkConfigurationUpdaterTestWithParamInstance,
     NetworkConfigurationUpdaterTestWithParam,
     testing::Values(key::kDeviceOpenNetworkConfiguration,
                     key::kOpenNetworkConfiguration));
 
 }  // namespace policy