Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/chromeos/app_mode/startup_app_launcher.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/chromeos/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 113 matching lines @@
 // static.
 void StartupAppLauncher::LoadOAuthFileOnBlockingPool(
     KioskOAuthParams* auth_params) {
   int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;
   std::string error_msg;
   base::FilePath user_data_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   base::FilePath auth_file = user_data_dir.Append(kOAuthFileName);
   scoped_ptr<JSONFileValueDeserializer> deserializer(
       new JSONFileValueDeserializer(user_data_dir.Append(kOAuthFileName)));
-  scoped_ptr<base::Value> value(
-      deserializer->Deserialize(&error_code, &error_msg));
+  scoped_ptr<base::Value> value =
+      deserializer->Deserialize(&error_code, &error_msg);
   base::DictionaryValue* dict = NULL;
   if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||
       !value.get() || !value->GetAsDictionary(&dict)) {
     LOG(WARNING) << "Can't find auth file at " << auth_file.value();
     return;
   }
 
   dict->GetString(kOAuthRefreshToken, &auth_params->refresh_token);
   dict->GetString(kOAuthClientId, &auth_params->client_id);
   dict->GetString(kOAuthClientSecret, &auth_params->client_secret);
@@ skipping 329 matching lines @@
   UpdateAppData();
   delegate_->OnReadyToLaunch();
 }
 
 void StartupAppLauncher::UpdateAppData() {
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
 }
 
 }   // namespace chromeos