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

ui/message_center/views/notification_view_unittest.cc

 // Copyright 2014 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 "ui/message_center/views/notification_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/constants.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/message_view_factory.h"
 #include "ui/message_center/views/notification_button.h"
 #include "ui/message_center/views/proportional_image_view.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget_delegate.h"
 
+namespace {
+
+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> GenerateGestureVerticalScrollUpdateEvent(
+    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;
+}
+
+}  // anonymouse namespace
+
 namespace message_center {
 
 // A test delegate used for tests that deal with the notification settings
 // button.
 class NotificationSettingsDelegate : public NotificationDelegate {
   bool ShouldDisplaySettingsButton() override { return true; }
 
  private:
   ~NotificationSettingsDelegate() override {}
 };
@@ skipping 112 matching lines @@
   }
 
   views::ImageButton* GetCloseButton() {
     return notification_view()->close_button();
   }
 
   void UpdateNotificationViews() {
     notification_view()->UpdateWithNotification(*notification());
   }
 
-  float GetNotificationSlideAmount() const {
-    return notification_view_->GetSlideOutLayer()
-        ->transform()
-        .To2dTranslation()
-        .x();
+  float GetNotificationScrollAmount() const {
+    return notification_view()->GetTransform().To2dTranslation().x();
   }
 
   bool IsRemoved(const std::string& notification_id) const {
     return (removed_ids_.find(notification_id) != removed_ids_.end());
   }
 
   void RemoveNotificationView() { notification_view_.reset(); }
 
-  void DispatchGesture(const ui::GestureEventDetails& details) {
-    ui::test::EventGenerator generator(
-        notification_view()->GetWidget()->GetNativeWindow());
-    gfx::Point center = notification_view()->GetBoundsInScreen().CenterPoint();
-    ui::GestureEvent event(center.x(), center.y(), 0, ui::EventTimeForNow(),
-                           details);
-    generator.Dispatch(&event);
-  }
-
-  void BeginScroll() {
-    DispatchGesture(ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN));
-  }
-
-  void EndScroll() {
-    DispatchGesture(ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END));
-  }
-
-  void ScrollBy(int dx) {
-    DispatchGesture(
-        ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_UPDATE, dx, 0));
-  }
-
  private:
   std::set<std::string> removed_ids_;
 
   std::unique_ptr<RichNotificationData> data_;
   std::unique_ptr<Notification> notification_;
   std::unique_ptr<NotificationView> notification_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationViewTest);
 };
 
@@ skipping 21 matching lines @@
   notification_view_.reset(static_cast<NotificationView*>(
       MessageViewFactory::Create(this, *notification_, true)));
   notification_view_->set_owned_by_client();
 
   views::Widget::InitParams init_params(
       CreateParams(views::Widget::InitParams::TYPE_POPUP));
   views::Widget* widget = new views::Widget();
   widget->Init(init_params);
   widget->SetContentsView(notification_view_.get());
   widget->SetSize(notification_view_->GetPreferredSize());
-  widget->Show();
 }
 
 void NotificationViewTest::TearDown() {
   widget()->Close();
   notification_view_.reset();
   views::ViewsTestBase::TearDown();
 }
 
 void NotificationViewTest::ClickOnNotification(
     const std::string& notification_id) {
@@ skipping 402 matching lines @@
   EXPECT_TRUE(result_utf8.find("hello") == std::string::npos);
 }
 
 TEST_F(NotificationViewTest, SlideOut) {
   ui::ScopedAnimationDurationScaleMode zero_duration_scope(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
 
   UpdateNotificationViews();
   std::string notification_id = notification()->id();
 
-  BeginScroll();
-  ScrollBy(-10);
+  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
+  auto event_scroll10 = GenerateGestureVerticalScrollUpdateEvent(-10);
+  auto event_scroll500 = GenerateGestureVerticalScrollUpdateEvent(-500);
+  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
+
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll10.get());
   EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(-10.f, GetNotificationSlideAmount());
-  EndScroll();
+  EXPECT_EQ(-10.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
   EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(0.f, GetNotificationSlideAmount());
+  EXPECT_EQ(0.f, GetNotificationScrollAmount());
 
-  BeginScroll();
-  ScrollBy(-180);
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll500.get());
   EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(-180.f, GetNotificationSlideAmount());
-  EndScroll();
+  EXPECT_EQ(-500.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
   EXPECT_TRUE(IsRemoved(notification_id));
 }
 
-TEST_F(NotificationViewTest, SlideOutNested) {
-  ui::ScopedAnimationDurationScaleMode zero_duration_scope(
-      ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
-
-  UpdateNotificationViews();
-  notification_view()->SetIsNested();
-  std::string notification_id = notification()->id();
-
-  BeginScroll();
-  ScrollBy(-10);
-  EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(-10.f, GetNotificationSlideAmount());
-  EndScroll();
-  EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(0.f, GetNotificationSlideAmount());
-
-  BeginScroll();
-  ScrollBy(-180);
-  EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_EQ(-180.f, GetNotificationSlideAmount());
-  EndScroll();
-  EXPECT_TRUE(IsRemoved(notification_id));
-}
-
 // Pinning notification is ChromeOS only feature.
 #if defined(OS_CHROMEOS)
 
 TEST_F(NotificationViewTest, SlideOutPinned) {
   ui::ScopedAnimationDurationScaleMode zero_duration_scope(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
 
   notification()->set_pinned(true);
   UpdateNotificationViews();
   std::string notification_id = notification()->id();
 
-  BeginScroll();
-  ScrollBy(-180);
+  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
+  auto event_scroll500 = GenerateGestureVerticalScrollUpdateEvent(-500);
+  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
+
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll500.get());
   EXPECT_FALSE(IsRemoved(notification_id));
-  EXPECT_LT(-180.f, GetNotificationSlideAmount());
-  EndScroll();
+  EXPECT_LT(-500.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
   EXPECT_FALSE(IsRemoved(notification_id));
 }
 
 TEST_F(NotificationViewTest, Pinned) {
   notification()->set_pinned(true);
 
   UpdateNotificationViews();
   EXPECT_EQ(NULL, GetCloseButton());
 }
 
 #endif // defined(OS_CHROMEOS)
 
 }  // namespace message_center