Move AppListModel::Users to AppListViewDelegate

ui/app_list/app_list_model_unittest.cc

 // 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.
 
 #include "ui/app_list/app_list_model.h"
 
 #include <map>
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item_model.h"
 #include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/base/models/list_model_observer.h"
 
 namespace app_list {
 
 namespace {
 
 class TestObserver : public AppListModelObserver,
                      public AppListItemListObserver {
  public:
   TestObserver()
       : status_changed_count_(0),
-        users_changed_count_(0),
         signin_changed_count_(0),
         items_added_(0),
         items_removed_(0),
         items_moved_(0) {
   }
   virtual ~TestObserver() {
   }
 
   // AppListModelObserver
   virtual void OnAppListModelStatusChanged() OVERRIDE {
     ++status_changed_count_;
   }
 
-  virtual void OnAppListModelUsersChanged() OVERRIDE {
-    ++users_changed_count_;
-  }
-
   virtual void OnAppListModelSigninStatusChanged() OVERRIDE {
     ++signin_changed_count_;
   }
 
   // AppListItemListObserver
   virtual void OnListItemAdded(size_t index, AppListItemModel* item) OVERRIDE {
     items_added_++;
   }
 
   virtual void OnListItemRemoved(size_t index,
                                  AppListItemModel* item) OVERRIDE {
     items_removed_++;
   }
 
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
                                AppListItemModel* item) OVERRIDE {
     items_moved_++;
   }
 
   int status_changed_count() const { return status_changed_count_; }
-  int users_changed_count() const { return users_changed_count_; }
   int signin_changed_count() const { return signin_changed_count_; }
   size_t items_added() { return items_added_; }
   size_t items_removed() { return items_removed_; }
   size_t items_moved() { return items_moved_; }
 
   void ResetCounts() {
     status_changed_count_ = 0;
-    users_changed_count_ = 0;
     signin_changed_count_ = 0;
     items_added_ = 0;
     items_removed_ = 0;
     items_moved_ = 0;
   }
 
  private:
   int status_changed_count_;
-  int users_changed_count_;
   int signin_changed_count_;
   size_t items_added_;
   size_t items_removed_;
   size_t items_moved_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 }  // namespace
 
@@ skipping 30 matching lines @@
   model_.SetStatus(AppListModel::STATUS_SYNCING);
   EXPECT_EQ(1, observer_.status_changed_count());
   EXPECT_EQ(AppListModel::STATUS_SYNCING, model_.status());
   model_.SetStatus(AppListModel::STATUS_NORMAL);
   EXPECT_EQ(2, observer_.status_changed_count());
   // Set the same status, no change is expected.
   model_.SetStatus(AppListModel::STATUS_NORMAL);
   EXPECT_EQ(2, observer_.status_changed_count());
 }
 
-TEST_F(AppListModelTest, SetUsers) {
-  EXPECT_EQ(0u, model_.users().size());
-  AppListModel::Users users;
-  users.push_back(AppListModel::User());
-  users[0].name = UTF8ToUTF16("test");
-  model_.SetUsers(users);
-  EXPECT_EQ(1, observer_.users_changed_count());
-  ASSERT_EQ(1u, model_.users().size());
-  EXPECT_EQ(UTF8ToUTF16("test"), model_.users()[0].name);
-}
-
 TEST_F(AppListModelTest, SetSignedIn) {
   EXPECT_TRUE(model_.signed_in());
   model_.SetSignedIn(false);
   EXPECT_EQ(1, observer_.signin_changed_count());
   EXPECT_FALSE(model_.signed_in());
   model_.SetSignedIn(true);
   EXPECT_EQ(2, observer_.signin_changed_count());
   EXPECT_TRUE(model_.signed_in());
   // Set the same signin state, no change is expected.
   model_.SetSignedIn(true);
@@ skipping 150 matching lines @@
   EXPECT_TRUE(ItemObservedByFolder(
       folder.get(), folder->item_list()->item_at(0)));
   EXPECT_TRUE(ItemObservedByFolder(
       folder.get(), folder->item_list()->item_at(num_observed_apps - 1)));
   // Check that item 4 is not observed.
   EXPECT_FALSE(ItemObservedByFolder(
       folder.get(), folder->item_list()->item_at(num_observed_apps)));
 }
 
 }  // namespace app_list