diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 15:12:09 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 15:12:09 +0000 |
| commit | 81067e05989c787c6b31a19626aa3f8039dcd485 (patch) | |
| tree | c57edd5f6d9a1cf3ce83d098eb3c3122e08e946d | |
| parent | b56c6b97fd50cd716b1652bdd2f8dfa90219c2e1 (diff) | |
| download | chromium_src-81067e05989c787c6b31a19626aa3f8039dcd485.zip chromium_src-81067e05989c787c6b31a19626aa3f8039dcd485.tar.gz chromium_src-81067e05989c787c6b31a19626aa3f8039dcd485.tar.bz2 | |
reenable a disabled part of a unit test
BUG=15363
TEST=ExtensionsService.LoadAllExtensionsFromDirectorySuccess
Review URL: http://codereview.chromium.org/159388
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21638 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extensions_service_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc index 4c3f587..3292e12 100644 --- a/chrome/browser/extensions/extensions_service_unittest.cc +++ b/chrome/browser/extensions/extensions_service_unittest.cc @@ -566,10 +566,8 @@ TEST_F(ExtensionsServiceTest, LoadAllExtensionsFromDirectorySuccess) { EXPECT_EQ(std::string(good1), loaded_[1]->id()); EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name()); EXPECT_EQ(std::string(""), loaded_[1]->description()); - // TODO(erikkay): re-enable: - // http://code.google.com/p/chromium/issues/detail?id=15363. - // EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"), - // loaded_[1]->background_url()); + EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"), + loaded_[1]->background_url()); EXPECT_EQ(0u, loaded_[1]->content_scripts().size()); EXPECT_EQ(2u, loaded_[1]->plugins().size()); EXPECT_EQ(loaded_[1]->path().AppendASCII("content_plugin.dll").value(), diff --git a/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json index c6da352..39cd652 100644 --- a/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json +++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json @@ -5,6 +5,6 @@ "plugins": [ { "path": "content_plugin.dll", "public": true }, { "path": "extension_plugin.dll" } - ] - /* "background_page": "background.html" */ + ], + "background_page": "background.html" } |