reland "CrOS: Fix appearance of notification toasts when sliding out via gesture"

ui/message_center/views/custom_notification_view_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace message_center {
 
 namespace {
 
 const SkColor kBackgroundColor = SK_ColorGREEN;
 
-std::unique_ptr<ui::GestureEvent> GenerateGestureEvent(ui::EventType type) {
-  ui::GestureEventDetails detail(type);
-  std::unique_ptr<ui::GestureEvent> event(
-      new ui::GestureEvent(0, 0, 0, base::TimeTicks(), detail));
-  return event;
-}
-
-std::unique_ptr<ui::GestureEvent> GenerateGestureHorizontalScrollUpdateEvent(
-    int dx) {
-  ui::GestureEventDetails detail(ui::ET_GESTURE_SCROLL_UPDATE, dx, 0);
-  std::unique_ptr<ui::GestureEvent> event(
-      new ui::GestureEvent(0, 0, 0, base::TimeTicks(), detail));
-  return event;
-}
-
 class TestCustomView : public views::View {
  public:
   TestCustomView() {
     SetFocusBehavior(FocusBehavior::ALWAYS);
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
   }
   ~TestCustomView() override {}
 
   void Reset() {
     mouse_event_count_ = 0;
@@ skipping 184 matching lines @@
 
   void KeyPress(ui::KeyboardCode key_code) {
     ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE);
     widget()->OnKeyEvent(&event);
   }
 
   void UpdateNotificationViews() {
     notification_view()->UpdateWithNotification(*notification());
   }
 
-  float GetNotificationScrollAmount() const {
-    return notification_view_->GetTransform().To2dTranslation().x();
-  }
-
   TestMessageCenterController* controller() { return &controller_; }
   Notification* notification() { return notification_.get(); }
   TestCustomView* custom_view() {
     return static_cast<TestCustomView*>(notification_view_->contents_view_);
   }
   views::Widget* widget() { return notification_view_->GetWidget(); }
   CustomNotificationView* notification_view() {
     return notification_view_.get();
   }
 
@@ skipping 23 matching lines @@
   ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                       ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
   EXPECT_EQ(3, custom_view()->mouse_event_count());
 
   EXPECT_EQ(0, custom_view()->keyboard_event_count());
   KeyPress(ui::VKEY_A);
   EXPECT_EQ(1, custom_view()->keyboard_event_count());
 }
 
-TEST_F(CustomNotificationViewTest, SlideOut) {
-  UpdateNotificationViews();
-  std::string notification_id = notification()->id();
-
-  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
-  auto event_scroll10 = GenerateGestureHorizontalScrollUpdateEvent(-10);
-  auto event_scroll500 = GenerateGestureHorizontalScrollUpdateEvent(-500);
-  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
-
-  notification_view()->OnGestureEvent(event_begin.get());
-  notification_view()->OnGestureEvent(event_scroll10.get());
-  EXPECT_FALSE(controller()->IsRemoved(notification_id));
-  EXPECT_EQ(-10.f, GetNotificationScrollAmount());
-  notification_view()->OnGestureEvent(event_end.get());
-  EXPECT_FALSE(controller()->IsRemoved(notification_id));
-  EXPECT_EQ(0.f, GetNotificationScrollAmount());
-
-  notification_view()->OnGestureEvent(event_begin.get());
-  notification_view()->OnGestureEvent(event_scroll500.get());
-  EXPECT_FALSE(controller()->IsRemoved(notification_id));
-  EXPECT_EQ(-500.f, GetNotificationScrollAmount());
-  notification_view()->OnGestureEvent(event_end.get());
-  EXPECT_TRUE(controller()->IsRemoved(notification_id));
-}
-
-// Pinning notification is ChromeOS only feature.
-#if defined(OS_CHROMEOS)
-
-TEST_F(CustomNotificationViewTest, SlideOutPinned) {
-  notification()->set_pinned(true);
-  UpdateNotificationViews();
-  std::string notification_id = notification()->id();
-
-  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
-  auto event_scroll500 = GenerateGestureHorizontalScrollUpdateEvent(-500);
-  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
-
-  notification_view()->OnGestureEvent(event_begin.get());
-  notification_view()->OnGestureEvent(event_scroll500.get());
-  EXPECT_FALSE(controller()->IsRemoved(notification_id));
-  EXPECT_LT(-500.f, GetNotificationScrollAmount());
-  notification_view()->OnGestureEvent(event_end.get());
-  EXPECT_FALSE(controller()->IsRemoved(notification_id));
-}
-
-#endif // defined(OS_CHROMEOS)
-
 TEST_F(CustomNotificationViewTest, PressBackspaceKey) {
   std::string notification_id = notification()->id();
   custom_view()->RequestFocus();
 
   ui::InputMethod* input_method = custom_view()->GetInputMethod();
   ASSERT_TRUE(input_method);
   TestTextInputClient text_input_client;
   input_method->SetFocusedTextInputClient(&text_input_client);
   ASSERT_EQ(&text_input_client, input_method->GetTextInputClient());
 
@@ skipping 36 matching lines @@
   EXPECT_EQ("360x10", size.ToString());
 
   // The long notification.
   custom_view()->set_preferred_size(gfx::Size(1000, 1000));
   size = notification_view()->GetPreferredSize();
   size.Enlarge(0, -notification_view()->GetInsets().height());
   EXPECT_EQ("360x1000", size.ToString());
 }
 
 }  // namespace message_center