Split ValueSerializer into separate Serializer and Deserializer classes.

sync/internal_api/sync_encryption_handler_impl_unittest.cc

 // Copyright 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 "sync/internal_api/sync_encryption_handler_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 647 matching lines @@
   VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kKeystoreKey);
 
   // Ensure the bootstrap is encoded properly (a base64 encoded encrypted blob
   // of list values containing the keystore keys).
   std::string decoded_bootstrap;
   ASSERT_TRUE(base::Base64Decode(keystore_bootstrap, &decoded_bootstrap));
   std::string decrypted_bootstrap;
   ASSERT_TRUE(
       GetCryptographer()->encryptor()->DecryptString(decoded_bootstrap,
                                                      &decrypted_bootstrap));
-  JSONStringValueSerializer json(decrypted_bootstrap);
+  JSONStringValueDeserializer json(decrypted_bootstrap);
   scoped_ptr<base::Value> deserialized_keystore_keys(
       json.Deserialize(NULL, NULL));
   ASSERT_TRUE(deserialized_keystore_keys.get());
   base::ListValue* keystore_list = NULL;
   deserialized_keystore_keys->GetAsList(&keystore_list);
   ASSERT_TRUE(keystore_list);
   ASSERT_EQ(2U, keystore_list->GetSize());
   std::string test_string;
   keystore_list->GetString(0, &test_string);
   ASSERT_EQ(old_keystore_key, test_string);
@@ skipping 1598 matching lines @@
     encryption_handler()->SetKeystoreKeys(keys,
                                           trans.GetWrappedTrans());
   }
   PumpLoop();
   Mock::VerifyAndClearExpectations(observer());
 
   VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCustomPass);
 }
 
 }  // namespace syncer