Fix ifdefs around INSTANTIATE_TEST_CASE_P in tab_drag_controller_interactive_uitest.cc

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 <stddef.h>
 
 #include <algorithm>
 
@@ skipping 1489 matching lines @@
   // Should be two windows and not dragging.
   ASSERT_FALSE(TabDragController::IsActive());
   ASSERT_EQ(2u, browser_list->size());
   for (auto* browser : *BrowserList::GetInstance()) {
     EXPECT_FALSE(GetIsDragged(browser));
     // Should not be maximized
     EXPECT_FALSE(browser->window()->IsMaximized());
   }
 }
 
 #if defined(OS_CHROMEOS)

[tapted, 2016/03/01 08:28:52]

(balanced on line 2341)

 // TODO(sky,sad): A number of tests below are disabled as they fail due to
 // resize locks with a real compositor. crbug.com/331924
 namespace {
 
 void DragInMaximizedWindowStep2(DetachToBrowserTabDragControllerTest* test,
                                 Browser* browser,
                                 TabStrip* tab_strip,
                                 const BrowserList* browser_list) {
   // There should be another browser.
   ASSERT_EQ(2u, browser_list->size());
@@ skipping 727 matching lines @@
   // The drag should have been reverted.
   ASSERT_EQ(1u, browser_list->size());
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
   EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
 
   ASSERT_TRUE(ReleaseInput());
   ASSERT_TRUE(ReleaseInput2());
 }
 
-#if defined(OS_CHROMEOS)
-
 namespace {
 
 void DetachToDockedWindowNextStep(
     DetachToBrowserTabDragControllerTest* test,
     const gfx::Point& target_point,
     int iteration) {
   ASSERT_EQ(2u, test->browser_list->size());
   Browser* new_browser = test->browser_list->get(1);
   ASSERT_TRUE(new_browser->window()->IsActive());
 
@@ skipping 63 matching lines @@
 
   ash::wm::WindowState* window_state =
       ash::wm::GetWindowState(new_browser->window()->GetNativeWindow());
   // The new window should not be maximized because it gets docked or snapped.
   EXPECT_FALSE(new_browser->window()->IsMaximized());
   // The new window should be docked and not snapped.
   EXPECT_TRUE(window_state->IsDocked());
   EXPECT_FALSE(window_state->IsSnapped());
 }
 
 #endif  // OS_CHROMEOS

[tapted, 2016/03/01 08:28:52]

This actually balances the #if defined(OS_CHROMEOS) on line 1510. The one I've
deleted on line 2258 was nested inside it.

[msw, 2016/03/01 18:08:32]

Acknowledged.

 
-#endif
-
-#if defined(USE_ASH) && defined(OS_CHROMEOS)  // TODO(win_ash,linux_ash)

[msw, 2016/03/01 18:08:32]

You CL desc says "#if ash && !chromeos", but this was "#if ash && chromeos".

[tapted, 2016/03/01 23:06:45]

oops - fixed. (I probably had it right the first time, but of course `cl upload`
removed the lines that started with a '#' :p)

+#if defined(USE_ASH)
 INSTANTIATE_TEST_CASE_P(TabDragging,

[msw, 2016/03/01 18:08:32]

Did you try any of these with just USE_AURA?
(it's fine if they fail or won't compile, but neat if they pass)

[tapted, 2016/03/01 23:06:45]

Yeah.. so like you say this file is in a sorry state. The extra test harnesses
like DetachToBrowserInSeparateDisplayTabDragControllerTest and
DifferentDeviceScaleFactorDisplayTabDragControllerTest
DetachToBrowserTabDragControllerTestTouch are currently inside `#if chromeos` so
they won't instantiate with aura unless that changes. And.. all the test cases
inside that block are DISABLED_ in any case :/

I think we can try adding "touch" to DetachToBrowserTabDragControllerTest and
see if that works on aura, but perhaps in a follow-up since it hasn't been tried
outside of ChromeOS before. First priority is to bring back the lost coverage
when USE_ASH went away on Windows.

Bringing up more on aura, and re-enabling the DISABLED_ stuff on ChromeOS, seem
to be blocked on some harder problems. Right now we're looking at bringing up as
much of this as we can (and makes sense to) for Mac, and there could be some
opportunity to neaten all this up. E.g. I want to move all the tests that are
clearly only meant for ChromeOS to a _chromeos.cc file (those relying on
ash::wm, for example).

                         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,
                         DetachToBrowserTabDragControllerTestTouch,
                         ::testing::Values("touch"));
-#elif defined(USE_ASH)
+#else
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));
 #endif