summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 20:52:16 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 20:52:16 +0000
commit22c379ac0a813d0b3e0fd34819aad2d3e48c39b7 (patch)
treeed6d50bc1d765941120bb1ffdd2d4ea7781e09f8 /chrome/browser/extensions
parent49a001691fa5791a7e6b47afdcae695d8c6e8ed9 (diff)
downloadchromium_src-22c379ac0a813d0b3e0fd34819aad2d3e48c39b7.zip
chromium_src-22c379ac0a813d0b3e0fd34819aad2d3e48c39b7.tar.gz
chromium_src-22c379ac0a813d0b3e0fd34819aad2d3e48c39b7.tar.bz2
Disable ExtensionApiTest.Toolstrip, crashy.
TBR=erikkay TEST=stop crashing BUG=30151 Review URL: http://codereview.chromium.org/588004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_toolstrip_apitest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_toolstrip_apitest.cc b/chrome/browser/extensions/extension_toolstrip_apitest.cc
index 93153da..d9f0e07 100644
--- a/chrome/browser/extensions/extension_toolstrip_apitest.cc
+++ b/chrome/browser/extensions/extension_toolstrip_apitest.cc
@@ -4,11 +4,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// See http://crbug.com/30151.
-#define Toolstrip DISABLED_Toolstrip
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Toolstrip) {
+// Disabled, http://crbug.com/30151.
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Toolstrip) {
ASSERT_TRUE(RunExtensionTest("toolstrip")) << message_;
}