Move AvatarMenuModel::Item into ui/base.

chrome/browser/profiles/avatar_menu_model_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/profiles/avatar_menu_model.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 57 matching lines @@
                                   name2, 0, std::string());
 
   MockObserver observer;
   EXPECT_EQ(0, observer.change_count());
 
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(0, observer.change_count());
 
   ASSERT_EQ(2U, model.GetNumberOfItems());
 
-  const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
+  const ui::AvatarMenuItemModel& item1 = model.GetItemAt(0);
   EXPECT_EQ(0U, item1.model_index);
   EXPECT_EQ(name1, item1.name);
 
-  const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
+  const ui::AvatarMenuItemModel& item2 = model.GetItemAt(1);
   EXPECT_EQ(1U, item2.model_index);
   EXPECT_EQ(name2, item2.name);
 }
 
 TEST_F(AvatarMenuModelTest, ActiveItem) {
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
   manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
                                   name1, 0, std::string());
@@ skipping 17 matching lines @@
                                   name1, 0, std::string());
   manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
                                   name2, 0, std::string());
 
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(0, observer.change_count());
 
   ASSERT_EQ(2U, model.GetNumberOfItems());
 
-  const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
+  const ui::AvatarMenuItemModel& item1 = model.GetItemAt(0);
   EXPECT_EQ(0U, item1.model_index);
   EXPECT_EQ(name1, item1.name);
 
-  const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
+  const ui::AvatarMenuItemModel& item2 = model.GetItemAt(1);
   EXPECT_EQ(1U, item2.model_index);
   EXPECT_EQ(name2, item2.name);
 
   // Change name of the first profile, to trigger resorting of the profiles:
   // now the first model should be named "beta", and the second be "gamma".
   manager()->profile_info_cache()->SetNameOfProfileAtIndex(0, newname1);
-  const AvatarMenuModel::Item& item1next = model.GetItemAt(0);
+  const ui::AvatarMenuItemModel& item1next = model.GetItemAt(0);
   EXPECT_GT(observer.change_count(), 1);
   EXPECT_EQ(0U, item1next.model_index);
   EXPECT_EQ(name2, item1next.name);
 
-  const AvatarMenuModel::Item& item2next = model.GetItemAt(1);
+  const ui::AvatarMenuItemModel& item2next = model.GetItemAt(1);
   EXPECT_EQ(1U, item2next.model_index);
   EXPECT_EQ(newname1, item2next.name);
 }
 
 TEST_F(AvatarMenuModelTest, ChangeOnNotify) {
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
   manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
                                   name1, 0, std::string());
@@ skipping 12 matching lines @@
                                   name3, 0, std::string());
 
   // Four changes happened via the call to CreateTestingProfile: adding the
   // profile to the cache, setting the user name, rebuilding the list of
   // profiles after the name change, and changing the avatar.
   // On Windows, an extra change happens to set the shortcut name for the
   // profile.
   EXPECT_GE(observer.change_count(), 4);
   ASSERT_EQ(3U, model.GetNumberOfItems());
 
-  const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
+  const ui::AvatarMenuItemModel& item1 = model.GetItemAt(0);
   EXPECT_EQ(0U, item1.model_index);
   EXPECT_EQ(name1, item1.name);
 
-  const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
+  const ui::AvatarMenuItemModel& item2 = model.GetItemAt(1);
   EXPECT_EQ(1U, item2.model_index);
   EXPECT_EQ(name2, item2.name);
 
-  const AvatarMenuModel::Item& item3 = model.GetItemAt(2);
+  const ui::AvatarMenuItemModel& item3 = model.GetItemAt(2);
   EXPECT_EQ(2U, item3.model_index);
   EXPECT_EQ(name3, item3.name);
 }
 
 TEST_F(AvatarMenuModelTest, ShowAvatarMenuInTrial) {
   // If multiprofile mode is not enabled, the trial will not be enabled, so it
   // isn't tested.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
@@ skipping 60 matching lines @@
       cache->GetUserDataDir().AppendASCII("p2"), ASCIIToUTF16("Test 2"),
       string16(), 0, "TEST_ID");
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(2U, model.GetNumberOfItems());
 
   // Now check that the sync_state of a managed user shows the managed user
   // avatar label instead.
   base::string16 managed_user_label =
       l10n_util::GetStringUTF16(IDS_MANAGED_USER_AVATAR_LABEL);
-  const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
+  const ui::AvatarMenuItemModel& item1 = model.GetItemAt(0);
   EXPECT_NE(item1.sync_state, managed_user_label);
 
-  const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
+  const ui::AvatarMenuItemModel& item2 = model.GetItemAt(1);
   EXPECT_EQ(item2.sync_state, managed_user_label);
 }
 
 }  // namespace