Index: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc |
=================================================================== |
--- chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc (revision 182296) |
+++ chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc (working copy) |
@@ -27,7 +27,7 @@ |
TEST_F(ExtensionManifestTest, BackgroundScripts) { |
std::string error; |
- scoped_ptr<DictionaryValue> manifest( |
+ scoped_ptr<base::DictionaryValue> manifest( |
LoadManifest("background_scripts.json", &error)); |
ASSERT_TRUE(manifest.get()); |
@@ -56,7 +56,7 @@ |
EXPECT_TRUE(extension->allow_background_js_access()); |
std::string error; |
- scoped_ptr<DictionaryValue> manifest( |
+ scoped_ptr<base::DictionaryValue> manifest( |
LoadManifest("background_page_legacy.json", &error)); |
ASSERT_TRUE(manifest.get()); |
extension = LoadAndExpectSuccess(Manifest(manifest.get(), "")); |
@@ -87,7 +87,7 @@ |
chrome::VersionInfo::CHANNEL_DEV); |
std::string error; |
- scoped_ptr<DictionaryValue> manifest( |
+ scoped_ptr<base::DictionaryValue> manifest( |
LoadManifest("background_page.json", &error)); |
ASSERT_TRUE(manifest.get()); |
manifest->SetBoolean(keys::kBackgroundPersistent, false); |
@@ -97,8 +97,8 @@ |
ASSERT_TRUE(extension); |
EXPECT_TRUE(extension->has_lazy_background_page()); |
- ListValue* permissions = new ListValue(); |
- permissions->Append(Value::CreateStringValue("webRequest")); |
+ base::ListValue* permissions = new base::ListValue(); |
+ permissions->Append(new base::StringValue("webRequest")); |
manifest->Set(keys::kPermissions, permissions); |
LoadAndExpectError(Manifest(manifest.get(), ""), |
errors::kWebRequestConflictsWithLazyBackground); |