diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 19:29:59 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 19:29:59 +0000 |
| commit | 263915f12d43663c12ebda65eaeba6faaa2aca17 (patch) | |
| tree | d593c4e0908a340117df5d1f87b6386207277d7e /chrome/browser/ui/gtk | |
| parent | 3ea80207418e4d3ae83493ce5b95d8ad854ced2f (diff) | |
| download | chromium_src-263915f12d43663c12ebda65eaeba6faaa2aca17.zip chromium_src-263915f12d43663c12ebda65eaeba6faaa2aca17.tar.gz chromium_src-263915f12d43663c12ebda65eaeba6faaa2aca17.tar.bz2 | |
This changes ProfileManager::GetProfileInfoCache() to be GetProfileInfo() and
returning the ProfileInfoInterface, making it easier to mock out for testing. In
the few places that require the full ProfileInfoCache, GetMutableProfileInfo()
was added.
Because a handful of Mac unittests make calls into g_browser_process for the
ProfileManager, BrowserTestHelper was expanded to set that up with a
TestingProfile and a FakeProfileInfo so that tests continue to pass.
BUG=60105
TEST=Covered by unit tests and browser tests.
Review URL: http://codereview.chromium.org/7711002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_titlebar.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 051c68e..0af428c 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -312,8 +312,8 @@ void BrowserTitlebar::Init() { // If multi-profile is enabled set up profile button and login notifications. // The button lives in its own vbox in container_hbox_. - ProfileInfoCache& cache = - g_browser_process->profile_manager()->GetProfileInfoCache(); + ProfileInfoInterface& cache = + g_browser_process->profile_manager()->GetProfileInfo(); if (ProfileManager::IsMultipleProfilesEnabled() && cache.GetNumberOfProfiles() > 1 && !browser_window_->browser()->profile()->IsOffTheRecord()) { |