summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_history_apitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 08:21:39 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 08:21:39 +0000
commit73f092fa32cb7cbd88c8b8a206daa09754d253c2 (patch)
tree1bcb106643f986c5303751814d1c8c9bdf147002 /chrome/browser/extensions/extension_history_apitest.cc
parent4b08f23615fca072a7214d64ff883767ffe7f04d (diff)
downloadchromium_src-73f092fa32cb7cbd88c8b8a206daa09754d253c2.zip
chromium_src-73f092fa32cb7cbd88c8b8a206daa09754d253c2.tar.gz
chromium_src-73f092fa32cb7cbd88c8b8a206daa09754d253c2.tar.bz2
Disable crashy ExtensionApiTest.History
TBR=skerner BUG=26296 TEST=browser_tests Review URL: http://codereview.chromium.org/6106009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_history_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_history_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_history_apitest.cc b/chrome/browser/extensions/extension_history_apitest.cc
index 1e882be..874f868 100644
--- a/chrome/browser/extensions/extension_history_apitest.cc
+++ b/chrome/browser/extensions/extension_history_apitest.cc
@@ -7,8 +7,8 @@
#include "chrome/common/chrome_switches.h"
#include "net/base/mock_host_resolver.h"
-// Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_History) {
+// Disabled, http://crbug.com/26296.
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_History) {
host_resolver()->AddRule("www.a.com", "127.0.0.1");
host_resolver()->AddRule("www.b.com", "127.0.0.1");
ASSERT_TRUE(StartTestServer());