Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / message_center / views / message_center_view_unittest.cc

diff --git a/src/ui/message_center/views/message_center_view_unittest.cc b/src/ui/message_center/views/message_center_view_unittest.cc
index 223a15d..8cdf1f7 100644 (file)
--- a/src/ui/message_center/views/message_center_view_unittest.cc
+++ b/src/ui/message_center/views/message_center_view_unittest.cc
@@ -38,11 +38,11 @@ class MockNotificationView : public NotificationView {
   explicit MockNotificationView(MessageCenterController* controller,
                                 const Notification& notification,
                                 Test* test);
-  virtual ~MockNotificationView();
+  ~MockNotificationView() override;
 
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual int GetHeightForWidth(int w) OVERRIDE;
-  virtual void Layout() OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  int GetHeightForWidth(int w) const override;
+  void Layout() override;
 
  private:
   Test* test_;
@@ -60,13 +60,13 @@ MockNotificationView::MockNotificationView(MessageCenterController* controller,
 MockNotificationView::~MockNotificationView() {
 }
 
-gfx::Size MockNotificationView::GetPreferredSize() {
+gfx::Size MockNotificationView::GetPreferredSize() const {
   test_->RegisterCall(GET_PREFERRED_SIZE);
   DCHECK(child_count() > 0);
   return NotificationView::GetPreferredSize();
 }
 
-int MockNotificationView::GetHeightForWidth(int width) {
+int MockNotificationView::GetHeightForWidth(int width) const {
   test_->RegisterCall(GET_HEIGHT_FOR_WIDTH);
   DCHECK(child_count() > 0);
   return NotificationView::GetHeightForWidth(width);
@@ -85,28 +85,28 @@ class MessageCenterViewTest : public testing::Test,
                               public MessageCenterController {
  public:
   MessageCenterViewTest();
-  virtual ~MessageCenterViewTest();
+  ~MessageCenterViewTest() override;
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  void SetUp() override;
+  void TearDown() override;
 
   MessageCenterView* GetMessageCenterView();
   int GetNotificationCount();
   int GetCallCount(CallType type);
 
  // Overridden from MessageCenterController:
-  virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE;
-  virtual void RemoveNotification(const std::string& notification_id,
-                                  bool by_user) OVERRIDE;
-  virtual scoped_ptr<ui::MenuModel> CreateMenuModel(
+  void ClickOnNotification(const std::string& notification_id) override;
+  void RemoveNotification(const std::string& notification_id,
+                          bool by_user) override;
+  scoped_ptr<ui::MenuModel> CreateMenuModel(
       const NotifierId& notifier_id,
-      const base::string16& display_source) OVERRIDE;
-  virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE;
-  virtual void ClickOnNotificationButton(const std::string& notification_id,
-                                         int button_index) OVERRIDE;
+      const base::string16& display_source) override;
+  bool HasClickedListener(const std::string& notification_id) override;
+  void ClickOnNotificationButton(const std::string& notification_id,
+                                 int button_index) override;
 
   // Overridden from MockNotificationView::Test
-  virtual void RegisterCall(CallType type) OVERRIDE;
+  void RegisterCall(CallType type) override;
 
   void LogBounds(int depth, views::View* view);
 
@@ -144,8 +144,9 @@ void MessageCenterViewTest::SetUp() {
   notifications.insert(&notification);
 
   // Then create a new MessageCenterView with that single notification.
+  base::string16 title;
   message_center_view_.reset(new MessageCenterView(
-      &message_center_, NULL, 100, false, /*top_down =*/false));
+      &message_center_, NULL, 100, false, /*top_down =*/false, title));
   message_center_view_->SetNotifications(notifications);
 
   // Remove and delete the NotificationView now owned by the MessageCenterView's