| Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc
|
| index 9d60a6354b8fc4edc0bc47ac6184a6e7b96f2967..82bda5adb10381a5290ab0fd43624420f9e34e7a 100644
|
| --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc
|
| @@ -74,7 +74,7 @@ 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);
|
| @@ -117,7 +117,7 @@ TEST_F(OverrideSettingsTest, ParseManifest) {
|
|
|
| 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);
|
| @@ -150,7 +150,7 @@ TEST_F(OverrideSettingsTest, ParsePrepopulatedId) {
|
|
|
| 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);
|
|
|