summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_uitest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 06:21:08 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 06:21:08 +0000
commit36a784c511d467509d9a70a76b0865f60380ec37 (patch)
treeb07995a90e876a6ff10ae2965c25bc190ae75072 /chrome/browser/extensions/extension_uitest.cc
parentf338a0ed8c0490fad58fa47799c98909e8750978 (diff)
downloadchromium_src-36a784c511d467509d9a70a76b0865f60380ec37.zip
chromium_src-36a784c511d467509d9a70a76b0865f60380ec37.tar.gz
chromium_src-36a784c511d467509d9a70a76b0865f60380ec37.tar.bz2
Re-enable the --enable-extensions flag. Fix a bug where the extensions.enable pref was not being honored. Add tests.
This is intended to be submitted after: http://codereview.chromium.org/132003 BUG=13467 TEST=Added unit tests Review URL: http://codereview.chromium.org/132045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_uitest.cc')
-rw-r--r--chrome/browser/extensions/extension_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc
index 7d63356..359ba9a 100644
--- a/chrome/browser/extensions/extension_uitest.cc
+++ b/chrome/browser/extensions/extension_uitest.cc
@@ -101,7 +101,7 @@ class SimpleApiCallExtensionTest : public SingleMessageExtensionUITest {
};
// TODO(port) Should become portable once ExternalTabMessageLoop is ported.
-#if 0
+#if defined(OS_WIN)
TEST_F(SimpleApiCallExtensionTest, RunTest) {
namespace keys = extension_automation_constants;
@@ -270,7 +270,7 @@ class RoundtripApiCallExtensionTest
// TODO(port) Should become portable once
// ExternalTabMessageLoop is ported.
-#if 0
+#if defined(OS_WIN)
TEST_F(RoundtripApiCallExtensionTest, RunTest) {
TestWithURL(GURL(
"chrome-extension://ofoknjclcmghjfmbncljcnpjmfmldhno/test.html"));
@@ -435,7 +435,7 @@ class BrowserEventExtensionTest
// TODO(port) Should become portable once
// ExternalTabMessageLoop is ported.
-#if 0
+#if defined(OS_WIN)
TEST_F(BrowserEventExtensionTest, RunTest) {
// The extension for this test does not specify a "key" property in its
// manifest file. Therefore, the extension system will automatically assign