Revert 97049 - Trying to see if it fixes sync_integration_tests

[Mac] Flip the flag for multi-profiles to on by default.

This also 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=Multi-profiles is on by default.

Review URL: http://codereview.chromium.org/7648037

TBR=rsesek@chromium.org
Review URL: http://codereview.chromium.org/7621031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97075 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index fcebda6..ad3dc46 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -26,7 +26,6 @@
 class FilePath;
 class NewProfileLauncher;
 class ProfileInfoCache;
-class ProfileInfoInterface;
 
 class ProfileManagerObserver {
  public:
@@ -158,14 +157,9 @@ class ProfileManager : public base::NonThreadSafe,
   // Register multi-profile related preferences in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
-  // Returns a ProfileInfoInterface object which can be used to get information
+  // Returns a ProfileInfoCache object which can be used to get information
   // about profiles without having to load them from disk.
-  virtual ProfileInfoInterface& GetProfileInfo();
-
-  // Returns the ProfileInfoInterface as a mutable ProfileInfoCache. This should
-  // only be used when you need the full set of methods. Wherever possible use
-  // the ProfileInfoInterface.
-  virtual ProfileInfoCache& GetMutableProfileInfo();
+  ProfileInfoCache& GetProfileInfoCache();
 
   // Schedules the profile at the given path to be deleted on shutdown.
   void ScheduleProfileForDeletion(const FilePath& profile_dir);