Make DictionaryValue::DeepCopyWithoutEmptyChildren return a scoped_ptr

chrome/browser/prefs/tracked/pref_hash_calculator.cc

 // Copyright 2013 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/prefs/tracked/pref_hash_calculator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 33 matching lines @@
 
 // Renders |value| as a string. |value| may be NULL, in which case the result
 // is an empty string. This method can be expensive and its result should be
 // re-used rather than recomputed where possible.
 std::string ValueAsString(const base::Value* value) {
   // Dictionary values may contain empty lists and sub-dictionaries. Make a
   // deep copy with those removed to make the hash more stable.
   const base::DictionaryValue* dict_value;
   scoped_ptr<base::DictionaryValue> canonical_dict_value;
   if (value && value->GetAsDictionary(&dict_value)) {
-    canonical_dict_value.reset(dict_value->DeepCopyWithoutEmptyChildren());
+    canonical_dict_value = dict_value->DeepCopyWithoutEmptyChildren();
     value = canonical_dict_value.get();
   }
 
   std::string value_as_string;
   if (value) {
     JSONStringValueSerializer serializer(&value_as_string);
     serializer.Serialize(*value);
   }
 
   return value_as_string;
@@ skipping 50 matching lines @@
                          digest_string)) {
     return VALID;
   }
   if (VerifyDigestString(seed_,
                          GetMessage(legacy_device_id_, path, value_as_string),
                          digest_string)) {
     return VALID_SECURE_LEGACY;
   }
   return INVALID;
 }