Split ValueSerializer into separate Serializer and Deserializer classes.

chrome/browser/profile_resetter/profile_resetter_unittest.cc

 // Copyright (c) 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 "chrome/browser/profile_resetter/profile_resetter.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
@@ skipping 942 matching lines @@
   ResettableSettingsSnapshot nonorganic_snap(profile());
   nonorganic_snap.RequestShortcuts(base::Closure());
   // Let it enumerate shortcuts on the FILE thread.
   base::MessageLoop::current()->RunUntilIdle();
 
   static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,
                 "this test needs to be expanded");
   for (int field_mask = 0; field_mask <= ResettableSettingsSnapshot::ALL_FIELDS;
        ++field_mask) {
     std::string report = SerializeSettingsReport(nonorganic_snap, field_mask);
-    JSONStringValueSerializer json(report);
+    JSONStringValueDeserializer json(report);
     std::string error;
     scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
     ASSERT_TRUE(root) << error;
     ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)) << error;
 
     base::DictionaryValue* dict =
         static_cast<base::DictionaryValue*>(root.get());
 
     base::ListValue* startup_urls = NULL;
     int startup_type = 0;
@@ skipping 111 matching lines @@
       new ResettableSettingsSnapshot(profile()));
   deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
                                                 base::Unretained(&capture)));
   deleted_snapshot.reset();
   // Running remaining tasks shouldn't trigger the callback to be called as
   // |deleted_snapshot| was deleted before it could run.
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace