Split ValueSerializer into separate Serializer and Deserializer classes.

This CL removes the Deserializer functionality from ValueSerializer,
and puts into separate class ValueDeserializer, so that class responsibility
is maintained.

BUG=455453
TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/925783002

Cr-Commit-Position: refs/heads/master@{#319239}

4 files changed, 13 insertions, 13 deletions

diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.cc b/chromeos/app_mode/kiosk_oem_manifest_parser.cc
index 77d79fb..f13d1a8 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;
diff --git a/chromeos/dbus/fake_easy_unlock_client.cc b/chromeos/dbus/fake_easy_unlock_client.cc
index ee741fb..7744188 100644
--- a/chromeos/dbus/fake_easy_unlock_client.cc
+++ b/chromeos/dbus/fake_easy_unlock_client.cc
@@ -20,8 +20,8 @@ const char kEc256PublicKeyKey[] = "ec_p256_public_key";
 // Extracts key pair index from a key in format "<key_type>: <key_pair_index>}".
 int ExtractKeyPairIndexFromKey(const std::string& key,
                                const std::string& key_type) {
-  JSONStringValueSerializer serializer(key);
-  scoped_ptr<base::Value> json_value(serializer.Deserialize(NULL, NULL));
+  JSONStringValueDeserializer deserializer(key);
+  scoped_ptr<base::Value> json_value(deserializer.Deserialize(NULL, NULL));
   if (!json_value)
     return -1;
 
diff --git a/chromeos/network/onc/onc_test_utils.cc b/chromeos/network/onc/onc_test_utils.cc
index 56e5bc6..522a9ed 100644
--- a/chromeos/network/onc/onc_test_utils.cc
+++ b/chromeos/network/onc/onc_test_utils.cc
@@ -48,11 +48,11 @@ scoped_ptr<base::DictionaryValue> ReadTestDictionary(
     return make_scoped_ptr(dict);
   }
 
-  JSONFileValueSerializer serializer(path);
-  serializer.set_allow_trailing_comma(true);
+  JSONFileValueDeserializer deserializer(path);
+  deserializer.set_allow_trailing_comma(true);
 
   std::string error_message;
-  base::Value* content = serializer.Deserialize(NULL, &error_message);
+  base::Value* content = deserializer.Deserialize(NULL, &error_message);
   CHECK(content != NULL) << "Couldn't json-deserialize file '"
                          << filename << "': " << error_message;
 
diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc
index d47597e..84a9220 100644
--- a/chromeos/tools/onc_validator/onc_validator.cc
+++ b/chromeos/tools/onc_validator/onc_validator.cc
@@ -84,13 +84,13 @@ void PrintHelp() {
 
 scoped_ptr<base::DictionaryValue> ReadDictionary(std::string filename) {
   base::FilePath path(filename);
-  JSONFileValueSerializer serializer(path);
-  serializer.set_allow_trailing_comma(true);
+  JSONFileValueDeserializer deserializer(path);
+  deserializer.set_allow_trailing_comma(true);
 
   base::DictionaryValue* dict = NULL;
 
   std::string json_error;
-  base::Value* value = serializer.Deserialize(NULL, &json_error);
+  base::Value* value = deserializer.Deserialize(NULL, &json_error);
   if (!value) {
     LOG(ERROR) << "Couldn't json-deserialize file '" << filename
                << "': " << json_error;