Index: chrome/common/extensions/extension_file_util_unittest.cc |
=================================================================== |
--- chrome/common/extensions/extension_file_util_unittest.cc (revision 182296) |
+++ chrome/common/extensions/extension_file_util_unittest.cc (working copy) |
@@ -379,7 +379,7 @@ |
} |
static scoped_refptr<Extension> LoadExtensionManifest( |
- DictionaryValue* manifest, |
+ base::DictionaryValue* manifest, |
const base::FilePath& manifest_dir, |
Manifest::Location location, |
int extra_flags, |
@@ -396,15 +396,16 @@ |
int extra_flags, |
std::string* error) { |
JSONStringValueSerializer serializer(manifest_value); |
- scoped_ptr<Value> result(serializer.Deserialize(NULL, error)); |
+ scoped_ptr<base::Value> result(serializer.Deserialize(NULL, error)); |
if (!result.get()) |
return NULL; |
- CHECK_EQ(Value::TYPE_DICTIONARY, result->GetType()); |
- return LoadExtensionManifest(static_cast<DictionaryValue*>(result.get()), |
- manifest_dir, |
- location, |
- extra_flags, |
- error); |
+ CHECK_EQ(base::Value::TYPE_DICTIONARY, result->GetType()); |
+ return LoadExtensionManifest( |
+ static_cast<base::DictionaryValue*>(result.get()), |
+ manifest_dir, |
+ location, |
+ extra_flags, |
+ error); |
} |
#if defined(OS_WIN) |
@@ -448,13 +449,13 @@ |
base::ScopedTempDir temp; |
ASSERT_TRUE(temp.CreateUniqueTempDir()); |
- scoped_ptr<DictionaryValue> value(new DictionaryValue()); |
+ scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); |
value->SetString("name", "test"); |
value->SetString("version", "1"); |
value->SetInteger("manifest_version", 1); |
- ListValue* scripts = new ListValue(); |
- scripts->Append(Value::CreateStringValue("foo.js")); |
+ base::ListValue* scripts = new base::ListValue(); |
+ scripts->Append(new base::StringValue("foo.js")); |
value->Set("background.scripts", scripts); |
std::string error; |
@@ -471,7 +472,7 @@ |
EXPECT_EQ(0U, warnings.size()); |
scripts->Clear(); |
- scripts->Append(Value::CreateStringValue("http://google.com/foo.js")); |
+ scripts->Append(new base::StringValue("http://google.com/foo.js")); |
extension = LoadExtensionManifest(value.get(), temp.path(), Manifest::LOAD, |
0, &error); |