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

chrome/browser/content_settings/content_settings_policy_provider.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/content_settings/content_settings_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 331 matching lines @@
     if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) {
       VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"
                  " Invalid JSON object: " << pattern_filter_json;
       continue;
     }
 
     scoped_ptr<base::DictionaryValue> pattern_filter_pair(
         static_cast<base::DictionaryValue*>(value.release()));
     std::string pattern_str;
     bool pattern_read = pattern_filter_pair->GetString("pattern", &pattern_str);
-    base::Value* cert_filter_ptr = NULL;
-    bool filter_read = pattern_filter_pair->Remove("filter", &cert_filter_ptr);
-    scoped_ptr<base::Value> cert_filter(cert_filter_ptr);
+    scoped_ptr<base::Value> cert_filter;
+    bool filter_read = pattern_filter_pair->Remove("filter", &cert_filter);
     if (!pattern_read || !filter_read ||
         !cert_filter->IsType(base::Value::TYPE_DICTIONARY)) {
       VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"
                  " Missing pattern or filter.";
       continue;
     }
 
     ContentSettingsPattern pattern =
         ContentSettingsPattern::FromString(pattern_str);
     // Ignore invalid patterns.
@@ skipping 119 matching lines @@
     ReadManagedDefaultSettings();
   }
 
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   CONTENT_SETTINGS_TYPE_DEFAULT,
                   std::string());
 }
 
 }  // namespace content_settings