Make ValueDeserializer::Deserialize return scoped_ptr

chromeos/system/statistics_provider.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 "chromeos/system/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 485 matching lines @@
 
   // Finished loading the statistics.
   on_statistics_loaded_.Signal();
   VLOG(1) << "Finished loading statistics.";
 }
 
 void StatisticsProviderImpl::LoadRegionsFile(const base::FilePath& filename) {
   JSONFileValueDeserializer regions_file(filename);
   int regions_error_code = 0;
   std::string regions_error_message;
-  regional_data_.reset(
-      regions_file.Deserialize(&regions_error_code, &regions_error_message));
+  regional_data_ =
+      regions_file.Deserialize(&regions_error_code, &regions_error_message);
   if (!regional_data_.get()) {
     if (base::SysInfo::IsRunningOnChromeOS())
       LOG(ERROR) << "Failed to load regions file '" << filename.value()
                  << "': error='" << regions_error_message << "'";
 
     return;
   }
   const base::DictionaryValue* full_dict = nullptr;
   if (!regional_data_->GetAsDictionary(&full_dict)) {
     LOG(ERROR) << "Bad regions file '" << filename.value()
@@ skipping 41 matching lines @@
   return StatisticsProviderImpl::GetInstance();
 }
 
 // static
 void StatisticsProvider::SetTestProvider(StatisticsProvider* test_provider) {
   g_test_statistics_provider = test_provider;
 }
 
 }  // namespace system
 }  // namespace chromeos