Gut ash::MaterialDesignController, and remove the about:flags entry.

ash/system/web_notification/web_notification_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/web_notification/web_notification_tray.h"
 
 #include <utility>
 #include <vector>
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
-#include "ash/test/ash_md_test_base.h"
+#include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 49 matching lines @@
     return new views::View;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestItem);
 };
 
 }  // namespace
 
 // TODO(jamescook): Move this to //ash/common. http://crbug.com/620955
-class WebNotificationTrayTest : public test::AshMDTestBase {
+class WebNotificationTrayTest : public test::AshTestBase {
  public:
   WebNotificationTrayTest() {}
   ~WebNotificationTrayTest() override {}
 
   void TearDown() override {
     GetMessageCenter()->RemoveAllNotifications(
         false /* by_user */, message_center::MessageCenter::RemoveType::ALL);
-    test::AshMDTestBase::TearDown();
+    test::AshTestBase::TearDown();
   }
 
  protected:
   void AddNotification(const std::string& id) {
     std::unique_ptr<message_center::Notification> notification;
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE, id,
         base::ASCIIToUTF16("Test Web Notification"),
         base::ASCIIToUTF16("Notification message body."), gfx::Image(),
         base::ASCIIToUTF16("www.test.org"), GURL(),
@@ skipping 37 matching lines @@
   }
 
   static void UpdateAutoHideStateNow() {
     GetPrimaryShelf()->shelf_layout_manager()->UpdateAutoHideStateNow();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
 };
 
-INSTANTIATE_TEST_CASE_P(
-    /* prefix intentionally left blank due to only one parameterization */,
-    WebNotificationTrayTest,
-    testing::Values(MaterialDesignController::NON_MATERIAL,
-                    MaterialDesignController::MATERIAL_NORMAL,
-                    MaterialDesignController::MATERIAL_EXPERIMENTAL));
-
-TEST_P(WebNotificationTrayTest, WebNotifications) {
+TEST_F(WebNotificationTrayTest, WebNotifications) {
   // TODO(mukai): move this test case to ui/message_center.
   ASSERT_TRUE(GetWidget());
 
   // Add a notification.
   AddNotification("test_id1");
   EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());
   EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));
   AddNotification("test_id2");
   AddNotification("test_id2");
   EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());
   EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));
 
   // Ensure that updating a notification does not affect the count.
   UpdateNotification("test_id2", "test_id3");
   UpdateNotification("test_id3", "test_id3");
   EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());
   EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));
 
   // Ensure that Removing the first notification removes it from the tray.
   RemoveNotification("test_id1");
   EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));
   EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());
 
   // Remove the remianing notification.
   RemoveNotification("test_id3");
   EXPECT_EQ(0u, GetMessageCenter()->NotificationCount());
   EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id3"));
 }
 
-TEST_P(WebNotificationTrayTest, WebNotificationPopupBubble) {
+TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
   // TODO(mukai): move this test case to ui/message_center.
   ASSERT_TRUE(GetWidget());
 
   // Adding a notification should show the popup bubble.
   AddNotification("test_id1");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
 
   // Updating a notification should not hide the popup bubble.
   AddNotification("test_id2");
   UpdateNotification("test_id2", "test_id3");
@@ skipping 14 matching lines @@
 
   GetTray()->message_center_tray_->ShowMessageCenterBubble();
   GetTray()->message_center_tray_->HideMessageCenterBubble();
 
   EXPECT_FALSE(GetTray()->IsPopupVisible());
 }
 
 using message_center::NotificationList;
 
 // Flakily fails. http://crbug.com/229791
-TEST_P(WebNotificationTrayTest, DISABLED_ManyMessageCenterNotifications) {
+TEST_F(WebNotificationTrayTest, DISABLED_ManyMessageCenterNotifications) {
   // Add the max visible notifications +1, ensure the correct visible number.
   size_t notifications_to_add =
       message_center::kMaxVisibleMessageCenterNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
     AddNotification(id);
   }
   bool shown = GetTray()->message_center_tray_->ShowMessageCenterBubble();
   EXPECT_TRUE(shown);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(GetTray()->message_center_bubble() != NULL);
   EXPECT_EQ(notifications_to_add, GetMessageCenter()->NotificationCount());
   EXPECT_EQ(
       message_center::kMaxVisibleMessageCenterNotifications,
       GetTray()->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
 }
 
 // Flakily times out. http://crbug.com/229792
-TEST_P(WebNotificationTrayTest, DISABLED_ManyPopupNotifications) {
+TEST_F(WebNotificationTrayTest, DISABLED_ManyPopupNotifications) {
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add =
       message_center::kMaxVisiblePopupNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
     AddNotification(id);
   }
   GetTray()->ShowPopups();
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   EXPECT_EQ(notifications_to_add, GetMessageCenter()->NotificationCount());
   NotificationList::PopupNotifications popups =
       GetMessageCenter()->GetPopupNotifications();
   EXPECT_EQ(message_center::kMaxVisiblePopupNotifications, popups.size());
 }
 
 // Verifies if the notification appears on both displays when extended mode.
-TEST_P(WebNotificationTrayTest, PopupShownOnBothDisplays) {
+TEST_F(WebNotificationTrayTest, PopupShownOnBothDisplays) {
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   // UpdateDisplay() creates the display notifications, so popup is visible.
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   WebNotificationTray* secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 
@@ skipping 11 matching lines @@
   UpdateDisplay("400x400,200x200");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 }
 
 // PopupAndSystemTray may fail in platforms other than ChromeOS because the
 // RootWindow's bound can be bigger than display::Display's work area so that
 // openingsystem tray doesn't affect at all the work area of popups.
-TEST_P(WebNotificationTrayTest, PopupAndSystemTray) {
+TEST_F(WebNotificationTrayTest, PopupAndSystemTray) {
   TestItem* test_item = new TestItem;
   GetSystemTray()->AddTrayItem(base::WrapUnique(test_item));
 
   AddNotification("test_id");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   int bottom = GetPopupWorkAreaBottom();
 
   // System tray is created, the popup's work area should be narrowed but still
   // visible.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ skipping 15 matching lines @@
   int bottom_with_notification = GetPopupWorkAreaBottom();
   EXPECT_GT(bottom, bottom_with_notification);
   EXPECT_LT(bottom_with_tray_notification, bottom_with_notification);
 
   // Close the system tray notifications.
   GetSystemTray()->HideNotificationView(test_item);
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   EXPECT_EQ(bottom, GetPopupWorkAreaBottom());
 }
 
-TEST_P(WebNotificationTrayTest, PopupAndAutoHideShelf) {
+TEST_F(WebNotificationTrayTest, PopupAndAutoHideShelf) {
   AddNotification("test_id");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   int bottom = GetPopupWorkAreaBottom();
 
   // Shelf's auto-hide state won't be HIDDEN unless window exists.
   std::unique_ptr<views::Widget> widget(CreateTestWidget());
   WmShelf* shelf = GetPrimaryShelf();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
@@ skipping 36 matching lines @@
 
   // Close the window again, which shows the shelf.
   widget.reset();
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   int bottom_shown_with_tray_notification = GetPopupWorkAreaBottom();
   EXPECT_GT(bottom_hidden_with_tray_notification,
             bottom_shown_with_tray_notification);
   EXPECT_GT(bottom_auto_shown, bottom_shown_with_tray_notification);
 }
 
-TEST_P(WebNotificationTrayTest, PopupAndFullscreen) {
+TEST_F(WebNotificationTrayTest, PopupAndFullscreen) {
   AddNotification("test_id");
   EXPECT_TRUE(IsPopupVisible());
   int bottom = GetPopupWorkAreaBottom();
 
   // Checks the work area for normal auto-hidden state.
   std::unique_ptr<views::Widget> widget(CreateTestWidget());
   WmShelf* shelf = GetPrimaryShelf();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   int bottom_auto_hidden = GetPopupWorkAreaBottom();
@@ skipping 25 matching lines @@
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(bottom, GetPopupWorkAreaBottom());
 
   generator.MoveMouseTo(
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint());
   shelf->UpdateVisibilityState();
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(bottom_auto_hidden, GetPopupWorkAreaBottom());
 }
 
-TEST_P(WebNotificationTrayTest, PopupAndSystemTrayMultiDisplay) {
+TEST_F(WebNotificationTrayTest, PopupAndSystemTrayMultiDisplay) {
   UpdateDisplay("800x600,600x400");
 
   AddNotification("test_id");
   int bottom = GetPopupWorkAreaBottom();
   int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray());
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(bottom, GetPopupWorkAreaBottom());
   EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray()));
 }
 
-// Tests that there is visual feedback for touch presses.
-TEST_P(WebNotificationTrayTest, TouchFeedback) {
-  // Touch feedback is not available in material mode.
-  if (MaterialDesignController::IsShelfMaterial())
-    return;
-
-  AddNotification("test_id");
-  RunAllPendingInMessageLoop();
-  WebNotificationTray* tray = GetTray();
-  EXPECT_TRUE(tray->visible());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  gfx::Point center_point = tray->GetBoundsInScreen().CenterPoint();
-  generator.set_current_location(center_point);
-
-  generator.PressTouch();
-  EXPECT_TRUE(tray->is_active());
-
-  generator.ReleaseTouch();
-  EXPECT_TRUE(tray->is_active());
-  EXPECT_TRUE(tray->IsMessageCenterBubbleVisible());
-
-  generator.GestureTapAt(center_point);
-  EXPECT_FALSE(tray->is_active());
-  EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
-}
-
-// Tests that while touch presses trigger visual feedback, that subsequent non
-// tap gestures cancel the feedback without triggering the message center.
-TEST_P(WebNotificationTrayTest, TouchFeedbackCancellation) {
-  // Touch feedback is not available in material mode.
-  if (MaterialDesignController::IsShelfMaterial())
-    return;
-
-  AddNotification("test_id");
-  RunAllPendingInMessageLoop();
-  WebNotificationTray* tray = GetTray();
-  EXPECT_TRUE(tray->visible());
-
-  ui::test::EventGenerator& generator = GetEventGenerator();
-  gfx::Rect bounds = tray->GetBoundsInScreen();
-  gfx::Point center_point = bounds.CenterPoint();
-  generator.set_current_location(center_point);
-
-  generator.PressTouch();
-  EXPECT_TRUE(tray->is_active());
-
-  gfx::Point out_of_bounds(bounds.x() - 1, center_point.y());
-  generator.MoveTouch(out_of_bounds);
-  EXPECT_FALSE(tray->is_active());
-
-  generator.ReleaseTouch();
-  EXPECT_FALSE(tray->is_active());
-  EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
-}
-
 }  // namespace ash