cros: Remove some OS platform ifdefs from ash

ash/shelf/shelf_view_unittest.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 "ash/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 2199 matching lines @@
   // ink drop state.
   generator.MoveMouseBy(app_list_button_->width(), 0);
   generator.MoveMouseBy(-app_list_button_->width(), 0);
   generator.ReleaseLeftButton();
   EXPECT_EQ(views::InkDropState::HIDDEN,
             app_list_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(app_list_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 }
 
-// There is no ink drop effect for gesture events on Windows.
-#if !defined(OS_WIN)
 // Tests that when the app list is hidden, tapping on the app list button
 // transitions ink drop states correctly.
 TEST_F(ShelfViewInkDropTest, AppListButtonGestureTapWhenHidden) {
   InitAppListButtonInkDrop();
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(app_list_button_->GetBoundsInScreen().CenterPoint());
 
   // Touch press on the button should end up in the pending state.
   generator.PressTouch();
@@ skipping 110 matching lines @@
   // state.
   touch_location.Offset(app_list_button_->width(), 0);
   generator.MoveTouch(touch_location);
   generator.ReleaseTouch();
   FinishAppListVisibilityChange();
   EXPECT_EQ(views::InkDropState::HIDDEN,
             app_list_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(app_list_button_ink_drop_->GetAndResetRequestedStates(),
               ElementsAre(views::InkDropState::HIDDEN));
 }
-#endif  // !defined(OS_WIN)
 
 // Tests that clicking on a shelf item that does not show a menu transitions ink
 // drop states correctly.
 TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressRelease) {
   InitBrowserButtonInkDrop();
 
   views::CustomButton* button = browser_button_;
   gfx::Point mouse_location = button->GetLocalBounds().CenterPoint();
 
   ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, mouse_location,
@@ skipping 344 matching lines @@
 
   generator.ReleaseRightButton();
   EXPECT_EQ(views::InkDropState::HIDDEN,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
 }
 
-// There is no ink drop effect for gesture events on Windows.
-#if !defined(OS_WIN)
 // Tests ink drop state transitions for the overflow button when the user taps
 // on it.
 TEST_F(OverflowButtonInkDropTest, TouchActivate) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(GetScreenPointInsideOverflowButton());
 
   generator.PressTouch();
   EXPECT_EQ(views::InkDropState::ACTION_PENDING,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
@@ skipping 90 matching lines @@
 
   generator.ReleaseTouch();
   EXPECT_EQ(views::InkDropState::HIDDEN,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
 }
 
-#endif  // !defined(OS_WIN)
-
 // Test fixture for testing material design ink drop on overflow button when it
 // is active.
 class OverflowButtonActiveInkDropTest : public OverflowButtonInkDropTest {
  public:
   OverflowButtonActiveInkDropTest() {}
   ~OverflowButtonActiveInkDropTest() override {}
 
   void SetUp() override {
     OverflowButtonInkDropTest::SetUp();
 
@@ skipping 106 matching lines @@
 
   generator.ReleaseRightButton();
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
-// There is no ink drop effect for gesture events on Windows.
-#if !defined(OS_WIN)
 // Tests ink drop state transitions for the overflow button when it is active
 // and the user taps on it.
 TEST_F(OverflowButtonActiveInkDropTest, TouchDeactivate) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(GetScreenPointInsideOverflowButton());
 
   generator.PressTouch();
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
@@ skipping 90 matching lines @@
 
   generator.ReleaseTouch();
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
-#endif  // !defined(OS_WIN)
-
 }  // namespace test
 }  // namespace ash