Move AvatarMenuModel::Item into ui/base.

chrome/browser/profiles/avatar_menu_model_unittest.cc

Index: chrome/browser/profiles/avatar_menu_model_unittest.cc
diff --git a/chrome/browser/profiles/avatar_menu_model_unittest.cc b/chrome/browser/profiles/avatar_menu_model_unittest.cc
index 3a140f8e04373d6bd3cd1d75021114a6acc57258..860d4b1c6fc126d778b88a10ab4d25245142688c 100644
--- a/chrome/browser/profiles/avatar_menu_model_unittest.cc
+++ b/chrome/browser/profiles/avatar_menu_model_unittest.cc
@@ -75,11 +75,11 @@ TEST_F(AvatarMenuModelTest, InitialCreation) {
 
   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);
 }
@@ -117,23 +117,23 @@ TEST_F(AvatarMenuModelTest, ModifyingNameResortsCorrectly) {
 
   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);
 }
@@ -166,15 +166,15 @@ TEST_F(AvatarMenuModelTest, ChangeOnNotify) {
   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);
 }
@@ -255,10 +255,10 @@ TEST_F(AvatarMenuModelTest, SyncState) {
   // 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);
 }