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

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 1147 matching lines @@
     RemoveChildView(avatar_button_.release());
     frame_->GetRootView()->Layout();
   }
 
   if (!avatar_button_.get())
     return;
 
   if (browser_view_->IsOffTheRecord()) {
     avatar_button_->SetIcon(browser_view_->GetOTRAvatarIcon());
   } else {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
+    ProfileInfoInterface& cache =
+        g_browser_process->profile_manager()->GetProfileInfo();
     Profile* profile = browser_view_->browser()->profile();
     size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (index != std::string::npos) {
       avatar_button_->SetIcon(cache.GetAvatarIconOfProfileAtIndex(index));
       avatar_button_->SetText(UTF16ToWideHack(
           cache.GetNameOfProfileAtIndex(index)));
     }
   }
 }