Refactor most c/b/profiles calls to ProfileInfoCache.

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/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
@@ skipping 29 matching lines @@
 #endif
   }
 
   AvatarMenu* GetAvatarMenu() {
     // Reset the MockObserver.
     mock_observer_.reset(new MockObserver());
     EXPECT_EQ(0, change_count());
 
     // Reset the model.
     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(std::string name) {
-    ProfileInfoCache* cache = manager()->profile_info_cache();
-    cache->AddProfileToCache(
-        cache->GetUserDataDir().AppendASCII(name), ASCIIToUTF16(name),
+    ProfileAttributesStorage* storage = manager()->profile_attributes_storage();
+    storage->AddProfile(
+        storage->GetUserDataDir().AppendASCII(name), ASCIIToUTF16(name),
         std::string(), base::string16(), 0, "TEST_ID");
   }
 
   int change_count() const { return mock_observer_->change_count(); }
 
  private:
   TestingProfileManager manager_;
   scoped_ptr<MockObserver> mock_observer_;
   scoped_ptr<AvatarMenu> avatar_menu_;
   content::TestBrowserThreadBundle thread_bundle_;
@@ skipping 13 matching lines @@
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(ASCIIToUTF16("Test 1"), item1.name);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(ASCIIToUTF16("Test 2"), item2.name);
 }
 
 TEST_F(ProfileListDesktopTest, NoOmittedProfiles) {
-  ProfileListDesktop profile_list(manager()->profile_info_cache());
+  ProfileListDesktop profile_list(manager()->profile_attributes_storage());
 
   // Profiles are stored and listed alphabetically.
   manager()->CreateTestingProfile("1 included");
   manager()->CreateTestingProfile("2 included");
   manager()->CreateTestingProfile("3 included");
   manager()->CreateTestingProfile("4 included");
 
   profile_list.RebuildMenu();
   ASSERT_EQ(4u, profile_list.GetNumberOfItems());
 
   const AvatarMenu::Item& item1 = profile_list.GetItemAt(0);
   EXPECT_EQ(0u, item1.menu_index);
-  EXPECT_EQ(0u, item1.profile_index);
   EXPECT_EQ(ASCIIToUTF16("1 included"), item1.name);
 
   const AvatarMenu::Item& item2 = profile_list.GetItemAt(1);
   EXPECT_EQ(1u, item2.menu_index);
-  EXPECT_EQ(1u, item2.profile_index);
   EXPECT_EQ(ASCIIToUTF16("2 included"), item2.name);
 
   const AvatarMenu::Item& item3 = profile_list.GetItemAt(2);
   EXPECT_EQ(2u, item3.menu_index);
-  EXPECT_EQ(2u, item3.profile_index);
   EXPECT_EQ(ASCIIToUTF16("3 included"), item3.name);
 
   const AvatarMenu::Item& item4 = profile_list.GetItemAt(3);
   EXPECT_EQ(3u, item4.menu_index);
-  EXPECT_EQ(3u, item4.profile_index);
   EXPECT_EQ(ASCIIToUTF16("4 included"), item4.name);
 
-  EXPECT_EQ(0u, profile_list.MenuIndexFromProfileIndex(0));
-  EXPECT_EQ(1u, profile_list.MenuIndexFromProfileIndex(1));
-  EXPECT_EQ(2u, profile_list.MenuIndexFromProfileIndex(2));
-  EXPECT_EQ(3u, profile_list.MenuIndexFromProfileIndex(3));
+  EXPECT_EQ(0u, profile_list.MenuIndexFromProfilePath(item1.profile_path));
+  EXPECT_EQ(1u, profile_list.MenuIndexFromProfilePath(item2.profile_path));
+  EXPECT_EQ(2u, profile_list.MenuIndexFromProfilePath(item3.profile_path));
+  EXPECT_EQ(3u, profile_list.MenuIndexFromProfilePath(item4.profile_path));
 }
 
 TEST_F(ProfileListDesktopTest, WithOmittedProfiles) {
-  ProfileListDesktop profile_list(manager()->profile_info_cache());
+  ProfileListDesktop profile_list(manager()->profile_attributes_storage());
 
   // Profiles are stored and listed alphabetically.
   AddOmittedProfile("0 omitted");
   manager()->CreateTestingProfile("1 included");
   AddOmittedProfile("2 omitted");
   manager()->CreateTestingProfile("3 included");
   manager()->CreateTestingProfile("4 included");
   AddOmittedProfile("5 omitted");
   manager()->CreateTestingProfile("6 included");
   AddOmittedProfile("7 omitted");
 
   profile_list.RebuildMenu();
   ASSERT_EQ(4u, profile_list.GetNumberOfItems());
 
   const AvatarMenu::Item& item1 = profile_list.GetItemAt(0);
   EXPECT_EQ(0u, item1.menu_index);
-  EXPECT_EQ(1u, item1.profile_index);
   EXPECT_EQ(ASCIIToUTF16("1 included"), item1.name);
 
   const AvatarMenu::Item& item2 = profile_list.GetItemAt(1);
   EXPECT_EQ(1u, item2.menu_index);
-  EXPECT_EQ(3u, item2.profile_index);
   EXPECT_EQ(ASCIIToUTF16("3 included"), item2.name);
 
   const AvatarMenu::Item& item3 = profile_list.GetItemAt(2);
   EXPECT_EQ(2u, item3.menu_index);
-  EXPECT_EQ(4u, item3.profile_index);
   EXPECT_EQ(ASCIIToUTF16("4 included"), item3.name);
 
   const AvatarMenu::Item& item4 = profile_list.GetItemAt(3);
   EXPECT_EQ(3u, item4.menu_index);
-  EXPECT_EQ(6u, item4.profile_index);
   EXPECT_EQ(ASCIIToUTF16("6 included"), item4.name);
 
-  EXPECT_EQ(0u, profile_list.MenuIndexFromProfileIndex(1));
-  EXPECT_EQ(1u, profile_list.MenuIndexFromProfileIndex(3));
-  EXPECT_EQ(2u, profile_list.MenuIndexFromProfileIndex(4));
-  EXPECT_EQ(3u, profile_list.MenuIndexFromProfileIndex(6));
+  EXPECT_EQ(0u, profile_list.MenuIndexFromProfilePath(item1.profile_path));
+  EXPECT_EQ(1u, profile_list.MenuIndexFromProfilePath(item2.profile_path));
+  EXPECT_EQ(2u, profile_list.MenuIndexFromProfilePath(item3.profile_path));
+  EXPECT_EQ(3u, profile_list.MenuIndexFromProfilePath(item4.profile_path));
 }
 
 TEST_F(ProfileListDesktopTest, ActiveItem) {
   manager()->CreateTestingProfile("Test 1");
   manager()->CreateTestingProfile("Test 2");
 
   AvatarMenu* model = GetAvatarMenu();
   ASSERT_EQ(2U, model->GetNumberOfItems());
   // TODO(jeremy): Expand test to verify active profile index other than 0
   // crbug.com/100871
@@ skipping 16 matching lines @@
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(ASCIIToUTF16(name1), item1.name);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(ASCIIToUTF16(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,
-        ASCIIToUTF16(newname1));
+  ProfileAttributesStorage* storage = manager()->profile_attributes_storage();
+  ProfileAttributesEntry* entry;
+  ASSERT_TRUE(
+      storage->GetProfileAttributesWithPath(item1.profile_path, &entry));
+  entry->SetName(ASCIIToUTF16(newname1));
+
   const AvatarMenu::Item& item1next = model->GetItemAt(0);
   EXPECT_EQ(1, change_count());
   EXPECT_EQ(0U, item1next.menu_index);
   EXPECT_EQ(ASCIIToUTF16(name2), item1next.name);
 
   const AvatarMenu::Item& item2next = model->GetItemAt(1);
   EXPECT_EQ(1U, item2next.menu_index);
   EXPECT_EQ(ASCIIToUTF16(newname1), item2next.name);
 }
 
@@ skipping 91 matching lines @@
 }
 
 TEST_F(ProfileListDesktopTest, SyncState) {
   // If multiprofile mode is not enabled then the menu is never shown.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   manager()->CreateTestingProfile("Test 1");
 
   // Add a managed user profile.
-  ProfileInfoCache* cache = manager()->profile_info_cache();
-  base::FilePath path = cache->GetUserDataDir().AppendASCII("p2");
-  cache->AddProfileToCache(path, ASCIIToUTF16("Test 2"), std::string(),
+  ProfileAttributesStorage* storage = manager()->profile_attributes_storage();
+  base::FilePath path = storage->GetUserDataDir().AppendASCII("p2");
+  storage->AddProfile(path, ASCIIToUTF16("Test 2"), std::string(),
                            base::string16(), 0, "TEST_ID");
-  cache->SetIsOmittedProfileAtIndex(cache->GetIndexOfProfileWithPath(path),
-                                    false);
+  ProfileAttributesEntry* entry;
+  ASSERT_TRUE(storage->GetProfileAttributesWithPath(path, &entry));
+  entry->SetIsOmitted(false);
 
   AvatarMenu* model = GetAvatarMenu();
   model->RebuildMenu();
   EXPECT_EQ(2U, model->GetNumberOfItems());
 
   // Now check that the username of a supervised user shows the supervised
   // user avatar label instead.
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_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