| Index: chromeos/app_mode/kiosk_oem_manifest_parser.cc
|
| diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.cc b/chromeos/app_mode/kiosk_oem_manifest_parser.cc
|
| index 77d79fb0f73d1cdb40944d2f682fe3998e9a4748..f13d1a8fd9cdd21e946ea8ac93ea6c52d7f05521 100644
|
| --- a/chromeos/app_mode/kiosk_oem_manifest_parser.cc
|
| +++ b/chromeos/app_mode/kiosk_oem_manifest_parser.cc
|
| @@ -28,14 +28,14 @@ KioskOemManifestParser::Manifest::Manifest()
|
| bool KioskOemManifestParser::Load(
|
| const base::FilePath& kiosk_oem_file,
|
| KioskOemManifestParser::Manifest* manifest) {
|
| - int error_code = JSONFileValueSerializer::JSON_NO_ERROR;
|
| + int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;
|
| std::string error_msg;
|
| - scoped_ptr<JSONFileValueSerializer> serializer(
|
| - new JSONFileValueSerializer(kiosk_oem_file));
|
| + scoped_ptr<JSONFileValueDeserializer> deserializer(
|
| + new JSONFileValueDeserializer(kiosk_oem_file));
|
| 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)) {
|
| return false;
|
|
|