Split ValueSerializer into separate Serializer and Deserializer classes.

components/policy/core/common/config_dir_policy_loader.cc

 // Copyright (c) 2012 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 "components/policy/core/common/config_dir_policy_loader.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 13 matching lines @@
 namespace {
 
 // Subdirectories that contain the mandatory and recommended policies.
 const base::FilePath::CharType kMandatoryConfigDir[] =
     FILE_PATH_LITERAL("managed");
 const base::FilePath::CharType kRecommendedConfigDir[] =
     FILE_PATH_LITERAL("recommended");
 
 PolicyLoadStatus JsonErrorToPolicyLoadStatus(int status) {
   switch (status) {
-    case JSONFileValueSerializer::JSON_ACCESS_DENIED:
-    case JSONFileValueSerializer::JSON_CANNOT_READ_FILE:
-    case JSONFileValueSerializer::JSON_FILE_LOCKED:
+    case JSONFileValueDeserializer::JSON_ACCESS_DENIED:
+    case JSONFileValueDeserializer::JSON_CANNOT_READ_FILE:
+    case JSONFileValueDeserializer::JSON_FILE_LOCKED:
       return POLICY_LOAD_STATUS_READ_ERROR;
-    case JSONFileValueSerializer::JSON_NO_SUCH_FILE:
+    case JSONFileValueDeserializer::JSON_NO_SUCH_FILE:
       return POLICY_LOAD_STATUS_MISSING;
     case base::JSONReader::JSON_INVALID_ESCAPE:
     case base::JSONReader::JSON_SYNTAX_ERROR:
     case base::JSONReader::JSON_UNEXPECTED_TOKEN:
     case base::JSONReader::JSON_TRAILING_COMMA:
     case base::JSONReader::JSON_TOO_MUCH_NESTING:
     case base::JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT:
     case base::JSONReader::JSON_UNSUPPORTED_ENCODING:
     case base::JSONReader::JSON_UNQUOTED_DICTIONARY_KEY:
       return POLICY_LOAD_STATUS_PARSE_ERROR;
@@ skipping 82 matching lines @@
     return;
   }
 
   // Start with an empty dictionary and merge the files' contents.
   // The files are processed in reverse order because |MergeFrom| gives priority
   // to existing keys, but the ConfigDirPolicyProvider gives priority to the
   // last file in lexicographic order.
   for (std::set<base::FilePath>::reverse_iterator config_file_iter =
            files.rbegin(); config_file_iter != files.rend();
        ++config_file_iter) {
-    JSONFileValueSerializer deserializer(*config_file_iter);
+    JSONFileValueDeserializer deserializer(*config_file_iter);
     deserializer.set_allow_trailing_comma(true);
     int error_code = 0;
     std::string error_msg;
     scoped_ptr<base::Value> value(
         deserializer.Deserialize(&error_code, &error_msg));
     if (!value.get()) {
       LOG(WARNING) << "Failed to read configuration file "
                    << config_file_iter->value() << ": " << error_msg;
       status.Add(JsonErrorToPolicyLoadStatus(error_code));
       continue;
@@ skipping 70 matching lines @@
   }
 }
 
 void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path,
                                           bool error) {
   if (!error)
     Reload(false);
 }
 
 }  // namespace policy