Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
index fcab2b9ca0e6128c3816a96df6f1e42b26e473be..5ad3f3ae94900d4b42157672b0153ce97e4bc0de 100644 |
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc |
@@ -590,7 +590,7 @@ void DragToSeparateWindowStep2(DetachToBrowserTabDragControllerTest* test, |
} // namespace |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragToSeparateWindow DISABLED_DragToSeparateWindow |
@@ -669,7 +669,7 @@ bool HasUserChangedWindowPositionOrSize(gfx::NativeWindow window) { |
} // namespace |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DetachToOwnWindow DISABLED_DetachToOwnWindow |
@@ -731,7 +731,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest, |
EXPECT_FALSE(tab_strip2->GetWidget()->HasCapture()); |
} |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DetachToOwnWindowFromMaximizedWindow \ |
@@ -1023,7 +1023,7 @@ void DragAllStep2(DetachToBrowserTabDragControllerTest* test, |
} // namespace |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragAll DISABLED_DragAll |
@@ -1084,7 +1084,7 @@ void DragAllToSeparateWindowStep2(DetachToBrowserTabDragControllerTest* test, |
} // namespace |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragAllToSeparateWindow DISABLED_DragAllToSeparateWindow |
@@ -1157,7 +1157,7 @@ void DragAllToSeparateWindowAndCancelStep2( |
} // namespace |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragAllToSeparateWindowAndCancel \ |
@@ -1214,7 +1214,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest, |
EXPECT_FALSE(browser2->window()->IsMaximized()); |
} |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragDirectlyToSecondWindow DISABLED_DragDirectlyToSecondWindow |
@@ -1269,7 +1269,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest, |
EXPECT_FALSE(browser2->window()->IsMaximized()); |
} |
-#if defined(OS_CHROMEOS) |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
// TODO(sky,sad): Disabled as it fails due to resize locks with a real |
// compositor. crbug.com/331924 |
#define MAYBE_DragSingleTabToSeparateWindow \ |