Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/chromeos/login/supervised/supervised_user_authentication.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/chromeos/login/supervised/supervised_user_authentication.h"
 
 #include "base/base64.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 40 matching lines @@
   key->GetRawKey(&raw_result);
   base::Base64Encode(raw_result, &result);
   return result;
 }
 
 base::DictionaryValue* LoadPasswordData(base::FilePath profile_dir) {
   JSONFileValueDeserializer deserializer(
       profile_dir.Append(kPasswordUpdateFile));
   std::string error_message;
   int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;
-  scoped_ptr<base::Value> value(
-      deserializer.Deserialize(&error_code, &error_message));
+  scoped_ptr<base::Value> value =
+      deserializer.Deserialize(&error_code, &error_message);
   if (JSONFileValueDeserializer::JSON_NO_ERROR != error_code) {
     LOG(ERROR) << "Could not deserialize password data, error = " << error_code
                << " / " << error_message;
     return NULL;
   }
   base::DictionaryValue* result;
   if (!value->GetAsDictionary(&result)) {
     LOG(ERROR) << "Stored password data is not a dictionary";
     return NULL;
   }
@@ skipping 243 matching lines @@
     LOG(FATAL) << "HMAC::Sign failed";
 
   std::string raw_result(out_bytes, out_bytes + sizeof(out_bytes));
 
   std::string result;
   base::Base64Encode(raw_result, &result);
   return result;
 }
 
 }  // namespace chromeos