Move AppListModel::Users to AppListViewDelegate

ui/app_list/cocoa/apps_search_box_controller_unittest.mm

 // Copyright 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/app_list/cocoa/apps_search_box_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "testing/gtest_mac.h"
@@ skipping 16 matching lines @@
 @property(assign, nonatomic) int textChangeCount;
 
 @end
 
 @implementation TestAppsSearchBoxDelegate
 
 @synthesize textChangeCount = textChangeCount_;
 
 - (id)init {
   if ((self = [super init])) {
-    app_list::AppListModel::Users users(2);
+    app_list::AppListViewDelegate::Users users(2);
     users[0].name = ASCIIToUTF16("user1");
     users[1].name = ASCIIToUTF16("user2");
     users[1].email = ASCIIToUTF16("user2@chromium.org");
     users[1].active = true;
-    appListModel_.SetUsers(users);
+    appListDelegate_.SetUsers(users);
   }
   return self;
 }
 
 - (app_list::SearchBoxModel*)searchBoxModel {
   return &searchBoxModel_;
 }
 
 - (app_list::AppListViewDelegate*)appListDelegate {
   return &appListDelegate_;
 }
 
+- (app_list::test::AppListTestViewDelegate*)appListTestViewDelegate {
+  return &appListDelegate_;
+}
+
+
 - (BOOL)control:(NSControl*)control
                textView:(NSTextView*)textView
     doCommandBySelector:(SEL)command {
   return NO;
 }
 
 - (void)modelTextDidChange {
   ++textChangeCount_;
 }
 
 - (CGFloat)bubbleCornerRadius {
   return 3;
 }
 
 - (app_list::AppListModel*)appListModel {
   return &appListModel_;
 }
 
 @end
 
 namespace app_list {
 namespace test {
 
-class AppsSearchBoxControllerTest : public ui::CocoaTest,
-                                    public AppListModelObserver {
+class AppsSearchBoxControllerTest : public ui::CocoaTest {
  public:
   AppsSearchBoxControllerTest() {
     Init();
   }
 
   virtual void SetUp() OVERRIDE {
     apps_search_box_controller_.reset(
         [[AppsSearchBoxController alloc] initWithFrame:
             NSMakeRect(0, 0, 400, 100)]);
     delegate_.reset([[TestAppsSearchBoxDelegate alloc] init]);
     [apps_search_box_controller_ setDelegate:delegate_];
-    [delegate_ appListModel]->AddObserver(this);
 
     ui::CocoaTest::SetUp();
     [[test_window() contentView] addSubview:[apps_search_box_controller_ view]];
   }
 
   virtual void TearDown() OVERRIDE {
-    [delegate_ appListModel]->RemoveObserver(this);
     [apps_search_box_controller_ setDelegate:nil];
     ui::CocoaTest::TearDown();
   }
 
   void SimulateKeyAction(SEL c) {
     NSControl* control = [apps_search_box_controller_ searchTextField];
     [apps_search_box_controller_ control:control
                                 textView:nil
                      doCommandBySelector:c];
   }
 
  protected:
-  // Overridden from app_list::AppListModelObserver:
-  virtual void OnAppListModelUsersChanged() OVERRIDE {
-    [apps_search_box_controller_ rebuildMenu];
-  }
-
-  virtual void OnAppListModelSigninStatusChanged() OVERRIDE {}
-
   base::scoped_nsobject<TestAppsSearchBoxDelegate> delegate_;
   base::scoped_nsobject<AppsSearchBoxController> apps_search_box_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsSearchBoxControllerTest);
 };
 
 TEST_VIEW(AppsSearchBoxControllerTest, [apps_search_box_controller_ view]);
 
 // Test the search box initialization, and search input and clearing.
@@ skipping 28 matching lines @@
   SimulateKeyAction(@selector(complete:));
   EXPECT_NSEQ([NSString string],
               [[apps_search_box_controller_ searchTextField] stringValue]);
   EXPECT_EQ(4, [delegate_ textChangeCount]);
 }
 
 // Test the popup menu items when there is only one user..
 TEST_F(AppsSearchBoxControllerTest, SearchBoxMenuSingleUser) {
   // Set a single user. We need to set the delegate again because the
   // AppListModel observer isn't hooked up in these tests.
-  [delegate_ appListModel]->SetUsers(app_list::AppListModel::Users(1));
+  [delegate_ appListTestViewDelegate]->SetUsers(
+      app_list::AppListViewDelegate::Users(1));
   [apps_search_box_controller_ setDelegate:delegate_];
 
   NSPopUpButton* menu_control = [apps_search_box_controller_ menuControl];
   EXPECT_TRUE([apps_search_box_controller_ appListMenu]);
   ui::MenuModel* menu_model
       = [apps_search_box_controller_ appListMenu]->menu_model();
   // Add one to the item count to account for the blank, first item that Cocoa
   // has in its popup menus.
   EXPECT_EQ(menu_model->GetItemCount() + 1,
             [[menu_control menu] numberOfItems]);
 
   // All command ids should be less than |SELECT_PROFILE| as no user menu items
   // are being shown.
   for (int i = 0; i < menu_model->GetItemCount(); ++i)
     EXPECT_LT(menu_model->GetCommandIdAt(i), AppListMenu::SELECT_PROFILE);
 
   // The number of items should match the index that starts profile items.
   EXPECT_EQ(AppListMenu::SELECT_PROFILE, menu_model->GetItemCount());
 }
 
 // Test the popup menu items for the multi-profile case.
 TEST_F(AppsSearchBoxControllerTest, SearchBoxMenu) {
-  const app_list::AppListModel::Users& users =
-      [delegate_ appListModel]->users();
+  const app_list::AppListViewDelegate::Users& users =
+      [delegate_ appListDelegate]->GetUsers();
   NSPopUpButton* menu_control = [apps_search_box_controller_ menuControl];
   EXPECT_TRUE([apps_search_box_controller_ appListMenu]);
   ui::MenuModel* menu_model
       = [apps_search_box_controller_ appListMenu]->menu_model();
   // Add one to the item count to account for the blank, first item that Cocoa
   // has in its popup menus.
   EXPECT_EQ(menu_model->GetItemCount() + 1,
             [[menu_control menu] numberOfItems]);
 
   ui::MenuModel* found_menu_model = menu_model;
@@ skipping 27 matching lines @@
       AppListMenu::SHOW_SETTINGS, &menu_model, &index));
   EXPECT_EQ(found_menu_model, menu_model);
   NSMenuItem* settings_item = [[menu_control menu] itemAtIndex:index + 1];
   EXPECT_FALSE([settings_item view]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(menu_model->GetLabelAt(index)),
               [settings_item title]);
 }
 
 // Test adding another user, and changing an existing one.
 TEST_F(AppsSearchBoxControllerTest, SearchBoxMenuChangingUsers) {
-  app_list::AppListModel::Users users = [delegate_ appListModel]->users();
+  app_list::AppListViewDelegate::Users users =
+      [delegate_ appListDelegate]->GetUsers();
   EXPECT_EQ(2u, users.size());
   ui::MenuModel* menu_model
       = [apps_search_box_controller_ appListMenu]->menu_model();
   // Adding one to account for the empty item at index 0 in Cocoa popup menus.
   int non_user_items = menu_model->GetItemCount() - users.size() + 1;
 
   NSPopUpButton* menu_control = [apps_search_box_controller_ menuControl];
   EXPECT_EQ(2, [[menu_control menu] numberOfItems] - non_user_items);
   EXPECT_NSEQ(base::SysUTF16ToNSString(users[0].name),
               [[[menu_control menu] itemAtIndex:1] title]);
 
   users[0].name = ASCIIToUTF16("renamed user");
-  app_list::AppListModel::User new_user;
+  app_list::AppListViewDelegate::User new_user;
   new_user.name = ASCIIToUTF16("user3");
   users.push_back(new_user);
-  [delegate_ appListModel]->SetUsers(users);
+  [delegate_ appListTestViewDelegate]->SetUsers(users);
+  // Note: menu does not automatically get rebuilt. Force a rebuild (which
+  // would normally occur when the UI is closed / re-opend).
+  [apps_search_box_controller_ rebuildMenu];
 
   // Should now be an extra item, and it should have correct titles.
   EXPECT_EQ(3, [[menu_control menu] numberOfItems] - non_user_items);
   EXPECT_NSEQ(base::SysUTF16ToNSString(users[0].name),
               [[[menu_control menu] itemAtIndex:1] title]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(new_user.name),
               [[[menu_control menu] itemAtIndex:3] title]);
 }
 
 }  // namespace test
 }  // namespace app_list