Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/profiles/profile_list_desktop_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/profile_list_desktop.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 45 matching lines @@
     // AvatarMenu and multiple profiles works after user logged in.
     manager_.SetLoggedIn(true);
 #endif
   }
 
   AvatarMenu* GetAvatarMenu() {
     // Reset the MockObserver.
     mock_observer_.reset(new MockObserver());
     EXPECT_EQ(0, change_count());
 
-    // Reset the model.
+    // Reset the menu.
     avatar_menu_.reset(new AvatarMenu(
-        manager()->profile_info_cache(),
+        manager()->profile_attributes_storage(),
         mock_observer_.get(),
         NULL));
     avatar_menu_->RebuildMenu();
     EXPECT_EQ(0, change_count());
     return avatar_menu_.get();
   }
 
   TestingProfileManager* manager() { return &manager_; }
 
   void AddOmittedProfile(const std::string& name) {
@@ skipping 244 matching lines @@
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_LEGACY_SUPERVISED_USER_AVATAR_LABEL);
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_NE(item1.username, supervised_user_label);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(item2.username, supervised_user_label);
 }
 
 }  // namespace