Split ValueSerializer into separate Serializer and Deserializer classes.

chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.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 "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
@@ skipping 56 matching lines @@
 using extensions::Manifest;
 using extensions::SettingsOverrides;
 namespace manifest_keys = extensions::manifest_keys;
 
 class OverrideSettingsTest : public testing::Test {
 };
 
 
 TEST_F(OverrideSettingsTest, ParseManifest) {
   std::string manifest(kManifest);
-  JSONStringValueSerializer json(&manifest);
+  JSONStringValueDeserializer json(manifest);
   std::string error;
   scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
   scoped_refptr<Extension> extension = Extension::Create(
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
       *static_cast<base::DictionaryValue*>(root.get()),
       Extension::NO_FLAGS,
       &error);
@@ skipping 22 matching lines @@
   ASSERT_TRUE(settings_override->homepage);
   EXPECT_EQ(GURL("http://www.homepage.com"), *settings_override->homepage);
 #else
   EXPECT_FALSE(
       extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 #endif
 }
 
 TEST_F(OverrideSettingsTest, ParsePrepopulatedId) {
   std::string manifest(kPrepopulatedManifest);
-  JSONStringValueSerializer json(&manifest);
+  JSONStringValueDeserializer json(manifest);
   std::string error;
   scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
   scoped_refptr<Extension> extension =
       Extension::Create(base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
                         Manifest::INVALID_LOCATION,
                         *static_cast<base::DictionaryValue*>(root.get()),
                         Extension::NO_FLAGS,
                         &error);
@@ skipping 12 matching lines @@
   EXPECT_EQ("http://www.foo.com/s?q={searchTerms}", search_engine->search_url);
   EXPECT_EQ(3, *search_engine->prepopulated_id);
 #else
   EXPECT_FALSE(
       extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 #endif
 }
 
 TEST_F(OverrideSettingsTest, ParseBrokenManifest) {
   std::string manifest(kBrokenManifest);
-  JSONStringValueSerializer json(&manifest);
+  JSONStringValueDeserializer json(manifest);
   std::string error;
   scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
   scoped_refptr<Extension> extension = Extension::Create(
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
       *static_cast<base::DictionaryValue*>(root.get()),
       Extension::NO_FLAGS,
       &error);
 #if defined(OS_WIN)
   EXPECT_FALSE(extension.get());
   EXPECT_EQ(
       extensions::ErrorUtils::FormatErrorMessage(
           extensions::manifest_errors::kInvalidEmptyDictionary,
           extensions::manifest_keys::kSettingsOverride),
       error);
 #else
   EXPECT_TRUE(extension.get());
   EXPECT_FALSE(
       extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 #endif
 }
 
 }  // namespace