| Index: chrome/common/extensions/extension_manifests_unittest.cc
|
| diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
|
| index e881c0717cb32c149cce3d58f909186c45191a48..087573cd433a0f431cfb7dd335d242750bcd54fa 100644
|
| --- a/chrome/common/extensions/extension_manifests_unittest.cc
|
| +++ b/chrome/common/extensions/extension_manifests_unittest.cc
|
| @@ -1016,7 +1016,7 @@ TEST_F(ExtensionManifestTest, BackgroundPage) {
|
| scoped_refptr<Extension> extension(
|
| LoadAndExpectSuccess("background_page.json"));
|
| ASSERT_TRUE(extension);
|
| - EXPECT_EQ("/foo.html", extension->background_url().path());
|
| + EXPECT_EQ("/foo.html", extension->GetBackgroundURL().path());
|
|
|
| std::string error;
|
| scoped_ptr<DictionaryValue> manifest(
|
| @@ -1024,12 +1024,26 @@ TEST_F(ExtensionManifestTest, BackgroundPage) {
|
| ASSERT_TRUE(manifest.get());
|
| extension = LoadAndExpectSuccess(Manifest(manifest.get(), ""));
|
| ASSERT_TRUE(extension);
|
| - EXPECT_EQ("/foo.html", extension->background_url().path());
|
| + EXPECT_EQ("/foo.html", extension->GetBackgroundURL().path());
|
|
|
| manifest->SetInteger(keys::kManifestVersion, 2);
|
| extension = LoadAndExpectSuccess(Manifest(manifest.get(), ""));
|
| ASSERT_TRUE(extension);
|
| - EXPECT_FALSE(extension->background_url().is_valid());
|
| + EXPECT_FALSE(extension->GetBackgroundURL().is_valid());
|
| +}
|
| +
|
| +TEST_F(ExtensionManifestTest, BackgroundScripts) {
|
| + scoped_refptr<Extension> extension(
|
| + LoadAndExpectSuccess("background_scripts.json"));
|
| + ASSERT_TRUE(extension);
|
| + EXPECT_EQ(2u, extension->background_scripts().size());
|
| + EXPECT_EQ("foo.js", extension->background_scripts()[0u]);
|
| + EXPECT_EQ("bar/baz.js", extension->background_scripts()[1u]);
|
| +
|
| + EXPECT_TRUE(extension->has_background_page());
|
| + EXPECT_EQ(std::string("/") +
|
| + extension_filenames::kGeneratedBackgroundPageFilename,
|
| + extension->GetBackgroundURL().path());
|
| }
|
|
|
| TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {
|
|
|