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

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 95124488d210556fb43d7709f036a3211940235b..85648dbc0840a3903ffe0e6e9941a4c15d96a6e0 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
@@ -2255,8 +2255,6 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTestTouch,
   ASSERT_TRUE(ReleaseInput2());
 }
 
-#if defined(OS_CHROMEOS)
-
 namespace {
 
 void DetachToDockedWindowNextStep(
@@ -2342,9 +2340,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
 
 #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"));
@@ -2357,7 +2353,7 @@ INSTANTIATE_TEST_CASE_P(TabDragging,
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTestTouch,
                         ::testing::Values("touch"));
-#elif defined(USE_ASH)
+#else
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));