summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 00:52:49 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 00:52:49 +0000
commitfab201a56ed18fed6bd153c13ec75024499ce370 (patch)
treee06963ff639378b01554d9119831466459b2f11f /chrome/browser/extensions/extension_tabs_apitest.cc
parent0af86da89ebe6b2efc7360a9fe616b0100e07cd1 (diff)
downloadchromium_src-fab201a56ed18fed6bd153c13ec75024499ce370.zip
chromium_src-fab201a56ed18fed6bd153c13ec75024499ce370.tar.gz
chromium_src-fab201a56ed18fed6bd153c13ec75024499ce370.tar.bz2
Reenable ExtensionApiTest.Tabs on Linux views.
BUG=61592 TEST=ExtensionApiTest.Tabs does not appear to crash anymore. Review URL: http://codereview.chromium.org/7084041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 91d3da8..9a8381f 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -18,13 +18,6 @@
#define MAYBE_TabOnRemoved TabOnRemoved
#endif
-// Crashes on linux views. http://crbug.com/61592
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-#define MAYBE_Tabs DISABLED_Tabs
-#else
-#define MAYBE_Tabs Tabs
-#endif
-
// Window resizes are not completed by the time the callback happens,
// so these tests fail on linux. http://crbug.com/72369
#if defined(OS_LINUX)
@@ -37,7 +30,7 @@
#define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen
#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
ASSERT_TRUE(StartTestServer());
// The test creates a tab and checks that the URL of the new tab