summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 22:02:16 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 22:02:16 +0000
commit85e90fb620057f4317d3b146dafeee9157f88504 (patch)
tree0f79f5fd81b458a288616ab59ab0e8b8ecff0ee6 /chrome
parent49f95e9eccbb3d1c9ce7b6a46adff337ef831fe2 (diff)
downloadchromium_src-85e90fb620057f4317d3b146dafeee9157f88504.zip
chromium_src-85e90fb620057f4317d3b146dafeee9157f88504.tar.gz
chromium_src-85e90fb620057f4317d3b146dafeee9157f88504.tar.bz2
Reenable tests that were disabled due to the epic flakyness of LocalStorage which has since been fixed.
TEST=none BUG=25746 Review URL: http://codereview.chromium.org/377011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/browser_action_apitest.cc3
-rw-r--r--chrome/browser/extensions/extension_storage_apitest.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index d542c43..6a220a6 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -140,8 +140,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabSpecificBrowserActionState) {
ASSERT_EQ(L"hi!", text);
}
-// This test is disabled. See bug 25746
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_BrowserActionPopup) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserActionPopup) {
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("popup")));
ResultCatcher catcher;
diff --git a/chrome/browser/extensions/extension_storage_apitest.cc b/chrome/browser/extensions/extension_storage_apitest.cc
index 1d2c481..b75cc0e 100644
--- a/chrome/browser/extensions/extension_storage_apitest.cc
+++ b/chrome/browser/extensions/extension_storage_apitest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/extension_apitest.h"
-// This test is disabled. See bug 25746
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Storage) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Storage) {
ASSERT_TRUE(RunExtensionTest("storage")) << message_;
}