Remove non-MD test coverage from TrayDetailsViewTest

ash/common/system/tray/tray_details_view_unittest.cc

 // Copyright 2013 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/tray_details_view.h"
 
 #include "ash/common/ash_view_ids.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.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_header_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 21 matching lines @@
 
   ~TestDetailsView() override {}
 
   TrayPopupHeaderButton* tray_popup_header_button() {
     return tray_popup_header_button_;
   }
 
   void FocusTitleRow() { title_row()->content()->RequestFocus(); }
 
   // TrayDetailsView:
   void CreateExtraTitleRowButtons() override {

[tdanderson, 2017/02/08 23:20:16]

nit: just remove this function completely. I will file a bug against myself to
track the TODO below.

[mohsen, 2017/02/09 02:43:10]

Done.

     // TODO(tdanderson): Add test coverage for material design buttons in the
     // title row once they are implemented.
-    if (MaterialDesignController::IsSystemTrayMenuMaterial())
-      return;
-
-    tray_popup_header_button_ =
-        new TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
-                                  IDS_ASH_STATUS_TRAY_BLUETOOTH);
-    title_row()->AddViewToRowNonMd(tray_popup_header_button_, true);
   }
 
   void CreateScrollerViews() { CreateScrollableList(); }
 
  private:
   TrayPopupHeaderButton* tray_popup_header_button_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDetailsView);
 };
 
@@ skipping 104 matching lines @@
 
   // Show the detailed view of item 2.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(test_item_2->default_view());
 
   // Transition back to default view, the default view of item 2 should have
   // focus.
   tray->GetSystemBubble()->bubble_view()->set_can_activate(true);
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    FocusBackButton(test_item_2->detailed_view());
-  else
-    test_item_2->detailed_view()->FocusTitleRow();
+  FocusBackButton(test_item_2->detailed_view());
   TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_item_2->default_view());
   EXPECT_FALSE(test_item_2->detailed_view());
   EXPECT_TRUE(test_item_2->default_view()->HasFocus());
 
   // Show the detailed view of item 2 again.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(test_item_2->default_view());
 
   // Transition back to default view, the default view of item 2 should NOT have
   // focus.
   TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_item_2->default_view());
   EXPECT_FALSE(test_item_2->detailed_view());
   EXPECT_FALSE(test_item_2->default_view()->HasFocus());
 }
 
-// Tests that HoverHighlightView enters hover state in response to touch.
-TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedback) {
-  // Material design detailed views will not use the visual feedback from
-  // HoverHighlightView.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  HoverHighlightView* view = CreateAndShowHoverHighlightView();
-  EXPECT_FALSE(view->hover());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->hover());
-
-  generator.ReleaseTouch();
-}
-
-// Tests that touch events leaving HoverHighlightView cancel the hover state.
-TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedbackCancellation) {
-  // Material design detailed views will not use the visual feedback from
-  // HoverHighlightView.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  HoverHighlightView* view = CreateAndShowHoverHighlightView();
-  EXPECT_FALSE(view->hover());
-
-  gfx::Rect view_bounds = view->GetBoundsInScreen();
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(view_bounds.CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->hover());
-
-  gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
-  generator.MoveTouch(move_point);
-  EXPECT_FALSE(view->hover());
-
-  generator.set_current_location(move_point);
-  generator.ReleaseTouch();
-  EXPECT_FALSE(view->hover());
-}
-
-// Tests that TrayPopupHeaderButton renders a background in response to touch.
-TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedback) {
-  // Material design detailed views will not use TrayPopupHeaderButton.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
-  EXPECT_FALSE(button->background());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(button->GetBoundsInScreen().CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(button->background());
-
-  generator.ReleaseTouch();
-  EXPECT_FALSE(button->background());
-}
-
-// Tests that touch events leaving TrayPopupHeaderButton cancel the touch
-// feedback background.
-TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedbackCancellation) {
-  // Material design detailed views will not use TrayPopupHeaderButton.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
-  EXPECT_FALSE(button->background());
-
-  gfx::Rect view_bounds = button->GetBoundsInScreen();
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  generator.set_current_location(view_bounds.CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(button->background());
-
-  gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
-  generator.MoveTouch(move_point);
-  EXPECT_FALSE(button->background());
-
-  generator.set_current_location(move_point);
-  generator.ReleaseTouch();
-  EXPECT_FALSE(button->background());
-}
-
-// Tests that a mouse entering TrayPopupHeaderButton renders a background as
-// visual feedback.
-TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonMouseHoverFeedback) {
-  // Material design detailed views will not use TrayPopupHeaderButton.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
-  EXPECT_FALSE(button->background());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  gfx::Rect bounds = button->GetBoundsInScreen();
-  gfx::Point initial_point(bounds.x() - 1, bounds.y());
-  generator.set_current_location(initial_point);
-  generator.MoveMouseBy(1, 0);
-  RunAllPendingInMessageLoop();
-  EXPECT_TRUE(button->background());
-}
-
 TEST_F(TrayDetailsViewTest, ScrollContentsTest) {
   SystemTray* tray = GetPrimarySystemTray();
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(base::WrapUnique(test_item));
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
   RunAllPendingInMessageLoop();
   test_item->detailed_view()->CreateScrollerViews();
 
@@ skipping 22 matching lines @@
 
   // Sticky header layer should be above the last child's layer.
   EXPECT_EQ(3u, layers.size());
   EXPECT_EQ(view3->layer(), layers[0]);
   EXPECT_EQ(view4->layer(), layers[1]);
   EXPECT_EQ(view2->layer(), layers[2]);
 }
 
 }  // namespace test
 }  // namespace ash