Fix rebuilding the profile selector on the OSX App Launcher.

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"
 #include "ui/app_list/app_list_menu.h"
+#include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #import "ui/base/cocoa/menu_controller.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
 @interface TestAppsSearchBoxDelegate : NSObject<AppsSearchBoxDelegate> {
  @private
   app_list::SearchBoxModel searchBoxModel_;
   app_list::test::AppListTestViewDelegate appListDelegate_;
@@ skipping 45 matching lines @@
 
 - (app_list::AppListModel*)appListModel {
   return &appListModel_;
 }
 
 @end
 
 namespace app_list {
 namespace test {
 
-class AppsSearchBoxControllerTest : public ui::CocoaTest {
+class AppsSearchBoxControllerTest : public ui::CocoaTest,
+                                    public AppListModelObserver {
  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 46 matching lines @@
   // 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());

[tapted, 2013/10/02 03:56:33]

This line actually had a bug. Adding the AppListModelObserver exposed it.

The problem is that there is no item for 'CURRENT_USER' -- SELECT_PROFILE had a
value of 4, but there are only 3 items: Settings, Help, Send Feedback.

Removing the unused CURRENT_USER enum value gives SELECT_PROFILE a value of 3,
and this test passes again.

 }
 
 // Test the popup menu items for the multi-profile case.
 TEST_F(AppsSearchBoxControllerTest, SearchBoxMenu) {
   const app_list::AppListModel::Users& users =
       [delegate_ appListModel]->users();
   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();
@@ skipping 31 matching lines @@
   // A regular item should have just the label.
   EXPECT_TRUE(ui::MenuModel::GetModelAndIndexForCommandId(
       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();
+  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;
+  new_user.name = ASCIIToUTF16("user3");
+  users.push_back(new_user);
+  [delegate_ appListModel]->SetUsers(users);
+
+  // 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