diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 06:42:21 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 06:42:21 +0000 |
| commit | c7e806076087077b42736ca05463b4c50014c6f8 (patch) | |
| tree | 6bdc62b2823301036f95a7257f605826a95e79a2 | |
| parent | a022868846871c7bd7529676e334d71f7b9c38ff (diff) | |
| download | chromium_src-c7e806076087077b42736ca05463b4c50014c6f8.zip chromium_src-c7e806076087077b42736ca05463b4c50014c6f8.tar.gz chromium_src-c7e806076087077b42736ca05463b4c50014c6f8.tar.bz2 | |
Revert 131261 - Disable moar tests whose code is missing on beta.
TBR=yoz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10022012
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10023010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131263 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/content_script_apitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/settings/settings_apitest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index ba80bf0..f6097ad 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptCSSLocalization) { ASSERT_TRUE(RunExtensionTest("content_scripts/css_l10n")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ContentScriptExtensionAPIs) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionAPIs) { ASSERT_TRUE(StartTestServer()); CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc index 2d1bce1..2bfa7be 100644 --- a/chrome/browser/extensions/settings/settings_apitest.cc +++ b/chrome/browser/extensions/settings/settings_apitest.cc @@ -172,7 +172,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { } }; -IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, DISABLED_SimpleTest) { +IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, SimpleTest) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); ASSERT_TRUE(RunExtensionTest("settings/simple_test")) << message_; @@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, DISABLED_SimpleTest) { // Note that only split-mode incognito is tested, because spanning mode // incognito looks the same as normal mode when the only API activity comes // from background pages. -IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, DISABLED_SplitModeIncognito) { +IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, SplitModeIncognito) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); @@ -209,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, DISABLED_SplitModeIncognito) { } IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, - DISABLED_OnChangedNotificationsBetweenBackgroundPages) { + OnChangedNotificationsBetweenBackgroundPages) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); @@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, } IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, - DISABLED_SyncAndLocalAreasAreSeparate) { + SyncAndLocalAreasAreSeparate) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); |