Skip to content

Commit

Permalink
Fix ifdefs around INSTANTIATE_TEST_CASE_P in tab_drag_controller_inte…
Browse files Browse the repository at this point in the history
…ractive_uitest.cc

The tests were instantiated as
  #if ash && chromeos
  #elif ash
  #endif

Since we've droped USE_ASH form most configurations, this means tests
were no longer being instantiated anywhere except ChromeOS.

Review URL: https://codereview.chromium.org/1755513002

Cr-Commit-Position: refs/heads/master@{#378602}
  • Loading branch information
tapted authored and Commit bot committed Mar 1, 2016
1 parent d645720 commit 964dcff
Showing 1 changed file with 2 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2255,8 +2255,6 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTestTouch,
ASSERT_TRUE(ReleaseInput2());
}

#if defined(OS_CHROMEOS)

namespace {

void DetachToDockedWindowNextStep(
Expand Down Expand Up @@ -2342,9 +2340,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,

#endif // OS_CHROMEOS

#endif

#if defined(USE_ASH) && defined(OS_CHROMEOS) // TODO(win_ash,linux_ash)
#if defined(USE_ASH)
INSTANTIATE_TEST_CASE_P(TabDragging,
DetachToBrowserInSeparateDisplayTabDragControllerTest,
::testing::Values("mouse", "touch"));
Expand All @@ -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"));
Expand Down

0 comments on commit 964dcff

Please sign in to comment.