Transfer responsibility for providing a close button for a notification to each implementation of M…

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 48 matching lines @@
   int mouse_event_count() const { return mouse_event_count_; }
   int keyboard_event_count() const { return keyboard_event_count_; }
 
  private:
   int mouse_event_count_ = 0;
   int keyboard_event_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(TestCustomView);
 };
 
+class TestContentViewDelegate : public CustomNotificationContentViewDelegate {
+ public:
+  bool IsCloseButtonFocused() const override { return false; }
+  void RequestFocusOnCloseButton() override {}
+  bool IsPinned() const override { return false; }
+};
+
 class TestNotificationDelegate : public NotificationDelegate {
  public:
   TestNotificationDelegate() {}
 
   // NotificateDelegate
-  std::unique_ptr<views::View> CreateCustomContent() override {
-    return base::WrapUnique(new TestCustomView);
+  std::unique_ptr<CustomContent> CreateCustomContent() override {
+    return base::MakeUnique<CustomContent>(
+        base::WrapUnique(new TestCustomView),
+        base::WrapUnique(new TestContentViewDelegate));

[xiyuan, 2016/12/06 17:11:16]

nit: WrapUnique -> MakeUnique

[yhanada, 2016/12/07 00:23:24]

Done.

   }
 
  private:
   ~TestNotificationDelegate() override {}
 
   DISALLOW_COPY_AND_ASSIGN(TestNotificationDelegate);
 };
 
 class TestMessageCenterController : public MessageCenterController {
  public:
@@ skipping 94 matching lines @@
         ui::ET_MOUSE_RELEASED, point, point, ui::EventTimeForNow(),
         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
     widget()->OnMouseEvent(&released_event);
   }
 
   void KeyPress(ui::KeyboardCode key_code) {
     ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE);
     widget()->OnKeyEvent(&event);
   }
 
-  views::ImageButton* close_button() {
-    return notification_view_->close_button();
-  }
   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(); }
 
  private:
   TestMessageCenterController controller_;
   scoped_refptr<TestNotificationDelegate> notification_delegate_;
   std::unique_ptr<Notification> notification_;
   std::unique_ptr<CustomNotificationView> notification_view_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomNotificationViewTest);
 };
 
 TEST_F(CustomNotificationViewTest, Background) {
   EXPECT_EQ(kBackgroundColor, GetBackgroundColor());
 }
 
-TEST_F(CustomNotificationViewTest, ClickCloseButton) {
-  widget()->Show();
-
-  gfx::Point cursor_location(1, 1);
-  views::View::ConvertPointToWidget(close_button(), &cursor_location);
-  PerformClick(cursor_location);
-  EXPECT_TRUE(controller()->IsRemoved(notification()->id()));
-}
-
 TEST_F(CustomNotificationViewTest, Events) {
   widget()->Show();
   custom_view()->RequestFocus();
 
   EXPECT_EQ(0, custom_view()->mouse_event_count());
   gfx::Point cursor_location(1, 1);
   views::View::ConvertPointToWidget(custom_view(), &cursor_location);
   PerformClick(cursor_location);
   EXPECT_EQ(2, custom_view()->mouse_event_count());
 
   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());
 }
 
 }  // namespace message_center