TTF: Renable TabDraggingTest.Tab1Tab{2,3}

chrome/browser/views/tabs/tab_dragging_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
 
 #if defined(OS_CHROMEOS)
 // This test doesn't make sense on chromeos as chromeos doesn't allow dragging
 // tabs out.
 #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
 #else
 #define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip
 #endif
 
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
+#if defined(OS_LINUX)
 // Disabled on Toolkit views bot. See http://crbug.com/42614
 #define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape
 #else
 // Flaky, see http://crbug.com/21092.
 #define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape
 #endif
 
+// These tests fail on Linux. See http://crbug.com/10941
+#if defined(OS_LINUX)
+#define MAYBE_Tab1Tab2 FAILS_Tab1Tab2
+#define MAYBE_Tab1Tab3 FAILS_Tab1Tab3
+#else
+#define MAYBE_Tab1Tab2 Tab1Tab2
+#define MAYBE_Tab1Tab3 Tab1Tab3
+#endif
 
 class TabDraggingTest : public UITest {
  protected:
   TabDraggingTest() {
     show_window_ = true;
   }
 };
 
 // Automated UI test to open three tabs in a new window, and drag Tab_1 into
 // the position of Tab_2.
-// Disabled as per http://crbug.com/10941
-TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
+TEST_F(TabDraggingTest, MAYBE_Tab1Tab2) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
@@ skipping 78 matching lines @@
   tab2 = browser->GetTab(1);
   ASSERT_TRUE(tab2.get());
   GURL tab2_new_url;
   ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
   EXPECT_EQ(tab1_url.spec(), tab2_new_url.spec());
   EXPECT_EQ(tab2_url.spec(), tab1_new_url.spec());
 }
 
 // Drag Tab_1 into the position of Tab_3.
-// Disabled as per http://crbug.com/10941
-TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
+TEST_F(TabDraggingTest, MAYBE_Tab1Tab3) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
@@ skipping 340 matching lines @@
   scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0));
   ASSERT_TRUE(tab1_2.get());
   GURL tab1_2_url;
   ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url));
 
   // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1.
   EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab1_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab3_url.spec());
 }