Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/supervised_user/supervised_user_site_list.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/supervised_user/supervised_user_site_list.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 11 matching lines @@
 const char kUrlKey[] = "url";
 const char kWhitelistKey[] = "whitelist";
 
 namespace {
 
 scoped_ptr<base::Value> ReadFileOnBlockingThread(const base::FilePath& path) {
   SCOPED_UMA_HISTOGRAM_TIMER("ManagedUsers.Whitelist.ReadDuration");
   JSONFileValueDeserializer deserializer(path);
   int error_code;
   std::string error_msg;
-  scoped_ptr<base::Value> value(
-      deserializer.Deserialize(&error_code, &error_msg));
+  scoped_ptr<base::Value> value =
+      deserializer.Deserialize(&error_code, &error_msg);
   if (!value) {
     LOG(ERROR) << "Couldn't load site list " << path.value() << ": "
                << error_msg;
   }
   return value.Pass();
 }
 
 // Takes a DictionaryValue entry from the JSON file and fills the whitelist
 // (via URL patterns or hostname hashes) and the URL in the corresponding Site
 // struct.
@@ skipping 121 matching lines @@
   }
 
   base::ListValue* sites = nullptr;
   if (!dict->GetList(kSitesKey, &sites)) {
     LOG(ERROR) << "Site list " << path.value() << " does not contain any sites";
     return;
   }
 
   callback.Run(make_scoped_refptr(new SupervisedUserSiteList(*sites)));
 }