Split ValueSerializer into separate Serializer and Deserializer classes.

remoting/host/pairing_registry_delegate_linux.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 "remoting/host/pairing_registry_delegate_linux.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
@@ skipping 28 matching lines @@
   scoped_ptr<base::ListValue> pairings(new base::ListValue());
 
   // Enumerate all pairing files in the pairing registry.
   base::FilePath registry_path = GetRegistryPath();
   base::FileEnumerator enumerator(registry_path, false,
                                   base::FileEnumerator::FILES,
                                   kPairingFilenamePattern);
   for (base::FilePath pairing_file = enumerator.Next(); !pairing_file.empty();
        pairing_file = enumerator.Next()) {
     // Read the JSON containing pairing data.
-    JSONFileValueSerializer serializer(pairing_file);
+    JSONFileValueDeserializer deserializer(pairing_file);
     int error_code;
     std::string error_message;
     scoped_ptr<base::Value> pairing_json(
-        serializer.Deserialize(&error_code, &error_message));
+        deserializer.Deserialize(&error_code, &error_message));
     if (!pairing_json) {
       LOG(WARNING) << "Failed to load '" << pairing_file.value() << "' ("
                    << error_code << ").";
       continue;
     }
 
     pairings->Append(pairing_json.release());
   }
 
   return pairings.Pass();
@@ skipping 14 matching lines @@
 
   return success;
 }
 
 PairingRegistry::Pairing PairingRegistryDelegateLinux::Load(
     const std::string& client_id) {
   base::FilePath registry_path = GetRegistryPath();
   base::FilePath pairing_file = registry_path.Append(
       base::StringPrintf(kPairingFilenameFormat, client_id.c_str()));
 
-  JSONFileValueSerializer serializer(pairing_file);
+  JSONFileValueDeserializer deserializer(pairing_file);
   int error_code;
   std::string error_message;
   scoped_ptr<base::Value> pairing(
-      serializer.Deserialize(&error_code, &error_message));
+      deserializer.Deserialize(&error_code, &error_message));
   if (!pairing) {
     LOG(WARNING) << "Failed to load pairing information: " << error_message
                  << " (" << error_code << ").";
     return PairingRegistry::Pairing();
   }
 
   base::DictionaryValue* pairing_dictionary;
   if (!pairing->GetAsDictionary(&pairing_dictionary)) {
     LOG(WARNING) << "Failed to parse pairing information: not a dictionary.";
     return PairingRegistry::Pairing();
@@ skipping 51 matching lines @@
     const base::FilePath& registry_path) {
   registry_path_for_testing_ = registry_path;
 }
 
 
 scoped_ptr<PairingRegistry::Delegate> CreatePairingRegistryDelegate() {
   return make_scoped_ptr(new PairingRegistryDelegateLinux());
 }
 
 }  // namespace remoting