linux_aura: Compile ash into chrome.

chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
 
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 1485 matching lines @@
 }
 
 }  // namespace
 
 #if defined(OS_CHROMEOS)
 // TODO(sky,sad): Disabled as it fails due to resize locks with a real
 // compositor. crbug.com/331924
 #define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \
   DISABLED_DragSingleTabToSeparateWindowInSecondDisplay
 #else
-#define MAYBE_DragSingleTabToSeparateWindow \
+#define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \
   DragSingleTabToSeparateWindowInSecondDisplay
 #endif
 // Drags from browser to a second display and releases input.
 IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
                        MAYBE_DragSingleTabToSeparateWindowInSecondDisplay) {
   // Add another tab.
   AddTabAndResetBrowser(browser());
   TabStrip* tab_strip = GetTabStripForBrowser(browser());
 
   // Move to the first tab and drag it enough so that it detaches.
@@ skipping 523 matching lines @@
             new_browser->window()->GetNativeWindow()->GetRootWindow());
 
   ASSERT_TRUE(test->DragTabAndExecuteTaskWhenDone(
       final_destination,
       base::Bind(&CancelDragTabToWindowInSeparateDisplayStep3,
                  tab_strip, browser_list)));
 }
 
 }  // 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_CancelDragTabToWindowIn2ndDisplay \
   DISABLED_CancelDragTabToWindowIn2ndDisplay
 #else
 #define MAYBE_CancelDragTabToWindowIn2ndDisplay \
   CancelDragTabToWindowIn2ndDisplay
 #endif
 // Drags from browser to a second display and releases input.
 IN_PROC_BROWSER_TEST_F(
@@ skipping 26 matching lines @@
   ASSERT_EQ(1u, native_browser_list->size());
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
   EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
 
   // Release the mouse
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
       ui_controls::LEFT, ui_controls::UP));
 }
 
-#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_CancelDragTabToWindowIn1stDisplay \
   DISABLED_CancelDragTabToWindowIn1stDisplay
 #else
 #define MAYBE_CancelDragTabToWindowIn1stDisplay \
   CancelDragTabToWindowIn1stDisplay
 #endif
 // Drags from browser from a second display to primary and releases input.
 IN_PROC_BROWSER_TEST_F(
@@ skipping 203 matching lines @@
   } else {
     // The new window should be snapped and not docked if docking is disabled.
     EXPECT_FALSE(window_state->IsDocked());
     EXPECT_TRUE(window_state->IsSnapped());
   }
 }
 
 
 #endif
 
-#if defined(USE_ASH) && !defined(OS_WIN)  // TODO(win_ash)
+#if defined(USE_ASH) && defined(OS_CHROMEOS)  // TODO(win_ash,linux_ash)
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserInSeparateDisplayTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DifferentDeviceScaleFactorDisplayTabDragControllerTest,
                         ::testing::Values("mouse"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToDockedTabDragControllerTest,
                         ::testing::Values("mouse", "mouse docked"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTestTouch,
                         ::testing::Values("touch", "touch docked"));
-#else
+#elif defined(USE_ASH) && !defined(OS_LINUX) // TODO(linux_ash)
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));
 #endif