Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.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 <string>
 
 #include <shlobj.h>  // Must be before propkey.
 #include <propkey.h>
 #include <shellapi.h>
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.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/profile_manager.h"
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/web_applications/web_app.h"
@@ skipping 163 matching lines @@
   WaitAndValidateBrowserWindowProperties(base::Bind(
       &ValidateBrowserWindowProperties, browser(), base::string16()));
 
   // If multiprofile mode is not enabled, we can't test the behavior when there
   // are multiple profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   // Two profile case. Both profile names should be shown.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
 
   base::FilePath path_profile2 =
       profile_manager->GenerateNextProfileDirectoryPath();
   profile_manager->CreateProfileAsync(path_profile2,
                                       base::Bind(&UnblockOnProfileCreation),
                                       base::string16(), std::string(),
                                       std::string());
 
   // Spin to allow profile creation to take place, loop is terminated
   // by UnblockOnProfileCreation when the profile is created.
   content::RunMessageLoop();
 
   // The default profile's name should be part of the relaunch name.
   WaitAndValidateBrowserWindowProperties(base::Bind(
       &ValidateBrowserWindowProperties,
       browser(),
       base::UTF8ToUTF16(browser()->profile()->GetProfileUserName())));
 
   // The second profile's name should be part of the relaunch name.
   Browser* profile2_browser =
       CreateBrowser(profile_manager->GetProfileByPath(path_profile2));
-  size_t profile2_index = cache.GetIndexOfProfileWithPath(path_profile2);
+  ProfileAttributesEntry* entry;
+  ASSERT_TRUE(profile_manager->GetProfileAttributesStorage().
+              GetProfileAttributesWithPath(path_profile2, &entry));
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateBrowserWindowProperties,
                  profile2_browser,
-                 cache.GetNameOfProfileAtIndex(profile2_index)));
+                 entry->GetName()));
 }
 
 // http://crbug.com/396344
 IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) {
 #if defined(USE_ASH)
   // Disable this test in Metro+Ash where Windows window properties aren't used.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
@@ skipping 20 matching lines @@
   for (auto* b : *BrowserList::GetInstance()) {
     if (b != browser())
       app_browser = b;
   }
   ASSERT_TRUE(app_browser);
   ASSERT_TRUE(app_browser != browser());
 
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension));
 }