[Mac][MC] Fix bustage from various refactorings.

ui/message_center/cocoa/notification_controller_unittest.mm

 // Copyright (c) 2013 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.
 
 #import "ui/message_center/cocoa/notification_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/notification.h"
 
 namespace {
 
-class MockMessageCenter : public FakeMessageCenter {
+class MockMessageCenter : public message_center::FakeMessageCenter {
  public:
   MockMessageCenter()
     : last_removed_by_user_(false),
       remove_count_(0) {
   }
 
   virtual void RemoveNotification(const std::string& id,
                                   bool by_user) OVERRIDE {
     last_removed_id_ = id;
-    last_removed_by_user_ = by_user_;
+    last_removed_by_user_ = by_user;
+    ++remove_count_;
   }
 
   const std::string& last_removed_id() const { return last_removed_id_; }
   bool last_removed_by_user() const { return last_removed_by_user_; }
   int remove_count() const { return remove_count_; }
 
  private:
   std::string last_removed_id_;
   bool last_removed_by_user_;
   int remove_count_;
@@ skipping 35 matching lines @@
           "",
           ASCIIToUTF16("Added to circles"),
           ASCIIToUTF16("Jonathan and 5 others"),
           string16(),
           std::string(),
           NULL));
   notification->set_icon(gfx::Image([TestIcon() retain]));
 
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
-                                              changeObserver:NULL]);
+                                               messageCenter:NULL]);
   [controller view];
 
   EXPECT_EQ(TestIcon(), [[controller iconView] image]);
   EXPECT_EQ(base::SysNSStringToUTF16([[controller titleView] stringValue]),
             notification->title());
   EXPECT_EQ(base::SysNSStringToUTF16([[controller messageView] stringValue]),
             notification->message());
   EXPECT_EQ(controller.get(), [[controller closeButton] target]);
 }
 
 TEST_F(NotificationControllerTest, OverflowText) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "",
           ASCIIToUTF16("This is a much longer title that should wrap "
                        "multiple lines."),
           ASCIIToUTF16("And even the message is long. This sure is a wordy "
                        "notification. Are you really going to read this "
                        "entire thing?"),
           string16(),
           std::string(),
           NULL));
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
-                                              changeObserver:NULL]);
+                                               messageCenter:NULL]);
   [controller view];
 
   EXPECT_GT(NSHeight([[controller view] frame]),
             message_center::kNotificationIconSize);
 }
 
 TEST_F(NotificationControllerTest, Close) {
   scoped_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE,
           "an_id",
           string16(),
           string16(),
           string16(),
           std::string(),
           NULL));
   MockMessageCenter messageCenter;
 
   scoped_nsobject<MCNotificationController> controller(
       [[MCNotificationController alloc] initWithNotification:notification.get()
                                                messageCenter:&messageCenter]);
   [controller view];
 
-  EXPECT_TRUE(1, messageCenter.remove_count());
+  [[controller closeButton] performClick:nil];
+
+  EXPECT_EQ(1, messageCenter.remove_count());
   EXPECT_EQ("an_id", messageCenter.last_removed_id());
   EXPECT_TRUE(messageCenter.last_removed_by_user());
-
-  [[controller closeButton] performClick:nil];
 }