This changes ProfileManager::GetProfileInfoCache() to be GetProfileInfo() and

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include <cmath>
 #include <numeric>
@@ skipping 1350 matching lines @@
 
 - (BOOL)shouldShowAvatar {
   if (![self hasTabStrip])
     return NO;
 
   if (browser_->profile()->IsOffTheRecord())
     return YES;
 
   if (ProfileManager::IsMultipleProfilesEnabled()) {
     // Show the profile avatar after the user has created more than one profile.
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
+    ProfileInfoInterface& cache =
+        g_browser_process->profile_manager()->GetProfileInfo();
     return cache.GetNumberOfProfiles() > 1;
   }
 
   return NO;
 }
 
 - (BOOL)isBookmarkBarVisible {
   return [bookmarkBarController_ isVisible];
 }
 
@@ skipping 797 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)