Make DictionaryValue::DeepCopyWithoutEmptyChildren return a scoped_ptr

chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc

 // Copyright 2014 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/ui/zoom/chrome_zoom_level_prefs.h"
 
 #include "base/bind.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_filter.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 112 matching lines @@
   else
     host_zoom_dictionary->SetDoubleWithoutPathExpansion(change.host, level);
 }
 
 // TODO(wjmaclean): Remove the dictionary_path once the migration code is
 // removed. crbug.com/420643
 void ChromeZoomLevelPrefs::ExtractPerHostZoomLevels(
     const base::DictionaryValue* host_zoom_dictionary,
     bool sanitize_partition_host_zoom_levels) {
   std::vector<std::string> keys_to_remove;
-  scoped_ptr<base::DictionaryValue> host_zoom_dictionary_copy(
-      host_zoom_dictionary->DeepCopyWithoutEmptyChildren());
+  scoped_ptr<base::DictionaryValue> host_zoom_dictionary_copy =
+      host_zoom_dictionary->DeepCopyWithoutEmptyChildren();
   for (base::DictionaryValue::Iterator i(*host_zoom_dictionary_copy);
        !i.IsAtEnd();
        i.Advance()) {
     const std::string& host(i.key());
     double zoom_level = 0;
 
     bool has_valid_zoom_level = i.value().GetAsDouble(&zoom_level);
 
     // Filter out A) the empty host, B) zoom levels equal to the default; and
     // remember them, so that we can later erase them from Prefs.
@@ skipping 55 matching lines @@
     // don't need to worry that host_zoom_dictionary is indirectly affected
     // by calls to HostZoomMap::SetZoomLevelForHost().
     ExtractPerHostZoomLevels(host_zoom_dictionary,
                              true /* sanitize_partition_host_zoom_levels */);
   }
   zoom_subscription_ = host_zoom_map_->AddZoomLevelChangedCallback(base::Bind(
       &ChromeZoomLevelPrefs::OnZoomLevelChanged, base::Unretained(this)));
 }
 
 }  // namespace chrome