Remove non-MD test coverage from SystemTrayTest

ash/common/system/tray/system_tray_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/system/tray/system_tray.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_delegate.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 508 matching lines @@
   // Close the modal dialog.
   widget.reset();
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   // System modal is gone. The bubble should now contains settings
   // as well.
   accessibility = tray->GetSystemBubble()->bubble_view()->GetViewByID(
       test::kAccessibilityTrayItemViewId);
   ASSERT_TRUE(accessibility);
   EXPECT_TRUE(accessibility->visible());
-
-  // Settings row is not present in material design.
-  if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    const views::View* settings =
-        tray->GetSystemBubble()->bubble_view()->GetViewByID(
-            test::kSettingsTrayItemViewId);
-    ASSERT_TRUE(settings);
-    EXPECT_TRUE(settings->visible());
-  }
 }
 
 // Tests that if SetVisible(true) is called while animating to hidden that the
 // tray becomes visible, and stops animating to hidden.
 TEST_F(SystemTrayTest, SetVisibleDuringHideAnimation) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->visible());
 
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> animation_duration;
   animation_duration.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
   tray->SetVisible(false);
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(0.0f, tray->layer()->GetTargetOpacity());
 
   tray->SetVisible(true);
   animation_duration.reset();
   tray->layer()->GetAnimator()->StopAnimating();
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
 }
 
-// Tests that touch on an item in the system bubble triggers it to become
-// active.
-TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedback) {
-  // Material design will use the ink drop ripple framework to show
-  // active states.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  SystemTray* tray = GetPrimarySystemTray();
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  TrayPopupItemContainer* view = static_cast<TrayPopupItemContainer*>(
-      tray->GetSystemBubble()->bubble_view()->child_at(0));
-  EXPECT_FALSE(view->active());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->active());
-
-  generator.ReleaseTouch();
-  EXPECT_FALSE(view->active());
-}
-
-// Tests that touch events on an item in the system bubble cause it to stop
-// being active.
-TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedbackCancellation) {
-  // Material design will use the ink drop ripple framework to show
-  // active states.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  SystemTray* tray = GetPrimarySystemTray();
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  TrayPopupItemContainer* view = static_cast<TrayPopupItemContainer*>(
-      tray->GetSystemBubble()->bubble_view()->child_at(0));
-  EXPECT_FALSE(view->active());
-
-  gfx::Rect view_bounds = view->GetBoundsInScreen();
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(view_bounds.CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->active());
-
-  gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
-  generator.MoveTouch(move_point);
-  EXPECT_FALSE(view->active());
-
-  generator.set_current_location(move_point);
-  generator.ReleaseTouch();
-  EXPECT_FALSE(view->active());
-}
-
 TEST_F(SystemTrayTest, SystemTrayHeightWithBubble) {
   SystemTray* tray = GetPrimarySystemTray();
   WebNotificationTray* notification_tray =
       StatusAreaWidgetTestHelper::GetStatusAreaWidget()
           ->web_notification_tray();
 
   // Ensure the initial tray bubble height is zero.
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 
   // Show the default view, ensure the tray bubble height is changed.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
 
   // Hide the default view, ensure the tray bubble height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
 
 }  // namespace test
 }  // namespace ash