| Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
|
| index d43781dfe169c1f9837288cb76b1d962b6184c37..00462959140e0cb9da04417a7968953c07b808c3 100644
|
| --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
|
| +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
|
| @@ -125,17 +125,17 @@ void StartupAppLauncher::StartLoadingOAuthFile() {
|
| // static.
|
| void StartupAppLauncher::LoadOAuthFileOnBlockingPool(
|
| KioskOAuthParams* auth_params) {
|
| - int error_code = JSONFileValueSerializer::JSON_NO_ERROR;
|
| + 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<JSONFileValueSerializer> serializer(
|
| - new JSONFileValueSerializer(user_data_dir.Append(kOAuthFileName)));
|
| + scoped_ptr<JSONFileValueDeserializer> deserializer(
|
| + new JSONFileValueDeserializer(user_data_dir.Append(kOAuthFileName)));
|
| scoped_ptr<base::Value> value(
|
| - serializer->Deserialize(&error_code, &error_msg));
|
| + deserializer->Deserialize(&error_code, &error_msg));
|
| base::DictionaryValue* dict = NULL;
|
| - if (error_code != JSONFileValueSerializer::JSON_NO_ERROR ||
|
| + if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||
|
| !value.get() || !value->GetAsDictionary(&dict)) {
|
| LOG(WARNING) << "Can't find auth file at " << auth_file.value();
|
| return;
|
|
|