summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 23:42:09 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 23:42:09 +0000
commit00fceac62015db950f3dde84f5aeeacb82f1b2c6 (patch)
treef1b2908364d25286f91ba440cdce4ca83b05d186 /chrome/browser/extensions
parent57059797beeedd32877fc11e9b7460a5d6a6262b (diff)
downloadchromium_src-00fceac62015db950f3dde84f5aeeacb82f1b2c6.zip
chromium_src-00fceac62015db950f3dde84f5aeeacb82f1b2c6.tar.gz
chromium_src-00fceac62015db950f3dde84f5aeeacb82f1b2c6.tar.bz2
Fix my previous revert. Merge issues.
TBR: aa git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index a0e4c81..48fb0ca 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -279,9 +279,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeed) {
EXPECT_STREQ("Not a valid feed", error.c_str());
}
-// TODO(mpcomplete): reenable these tests.
-#if 0
-
// Tests that message passing between extensions and tabs works.
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingExtensionTab) {
ASSERT_TRUE(LoadExtension(