summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 23:25:27 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 23:25:27 +0000
commit4aca1ba4b4e571d389720710ca7964445bd1d5ac (patch)
treef1667f75091304a84928279b8d030486df860956 /chrome/browser/extensions
parent92a68c6423124d6f73739d24d294df531d2cc621 (diff)
downloadchromium_src-4aca1ba4b4e571d389720710ca7964445bd1d5ac.zip
chromium_src-4aca1ba4b4e571d389720710ca7964445bd1d5ac.tar.gz
chromium_src-4aca1ba4b4e571d389720710ca7964445bd1d5ac.tar.bz2
Revert 50050 - Revert r48693: This broke existing extensions that wanted to run script on XML
pages. For more info, see: http://code.google.com/p/chromium/issues/detail?id=39845#c7 TBR=rafaelw@chromium.org TBR=aa@chromium.org Review URL: http://codereview.chromium.org/2812006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc47
1 files changed, 0 insertions, 47 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 5d7aac7..e060b40 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -962,53 +962,6 @@ TEST_F(ExtensionsServiceTest, InstallTheme) {
ValidatePrefKeyCount(pref_count);
}
-TEST_F(ExtensionsServiceTest, LoadLocalizedTheme) {
- // Load.
- InitializeEmptyExtensionsService();
- FilePath extension_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_path));
- extension_path = extension_path
- .AppendASCII("extensions")
- .AppendASCII("theme_i18n");
-
- service_->LoadExtension(extension_path);
- loop_.RunAllPending();
- EXPECT_EQ(0u, GetErrors().size());
- ASSERT_EQ(1u, loaded_.size());
- EXPECT_EQ(1u, service_->extensions()->size());
- EXPECT_EQ("name", service_->extensions()->at(0)->name());
- EXPECT_EQ("description", service_->extensions()->at(0)->description());
-}
-
-TEST_F(ExtensionsServiceTest, InstallLocalizedTheme) {
- // Pack.
- InitializeEmptyExtensionsService();
- FilePath extension_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_path));
- extension_path = extension_path
- .AppendASCII("extensions")
- .AppendASCII("theme_i18n");
-
- FilePath crx_path;
- ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &crx_path));
- crx_path = crx_path.AppendASCII("theme.crx");
- FilePath pem_path = crx_path.DirName().AppendASCII("theme.pem");
-
- ASSERT_TRUE(file_util::Delete(crx_path, false));
- ASSERT_TRUE(file_util::Delete(pem_path, false));
- scoped_ptr<ExtensionCreator> creator(new ExtensionCreator());
- ASSERT_TRUE(creator->Run(extension_path, crx_path, FilePath(), pem_path));
- ASSERT_TRUE(file_util::PathExists(crx_path));
-
- // Install.
- service_->UnloadAllExtensions();
- InstallExtension(crx_path, true);
- EXPECT_EQ(0u, GetErrors().size());
- EXPECT_EQ(1u, service_->extensions()->size());
- EXPECT_EQ("name", service_->extensions()->at(0)->name());
- EXPECT_EQ("description", service_->extensions()->at(0)->description());
-}
-
TEST_F(ExtensionsServiceTest, InstallApps) {
InitializeEmptyExtensionsService();
FilePath extensions_path;