Revert 97049 - Trying to see if it fixes sync_integration_tests

chrome/browser/profiles/profile_manager.h

 // 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class FilePath;
 class NewProfileLauncher;
 class ProfileInfoCache;
-class ProfileInfoInterface;
 
 class ProfileManagerObserver {
  public:
   enum Status {
     // So epic.
     STATUS_FAIL,
     // Profile created but before initializing extensions and promo resources.
     STATUS_CREATED,
     // Profile is created, extensions and promo resources are initialized.
     STATUS_INITIALIZED
@@ skipping 111 matching lines @@
 
   // Creates a new profile in the next available multiprofile directory.
   // Directories are named "profile_1", "profile_2", etc., in sequence of
   // creation. (Because directories can be removed, however, it may be the case
   // that at some point the list of numbered profiles is not continuous.)
   static void CreateMultiProfileAsync();
 
   // 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);
 
   // Checks if multiple profiles is enabled.
   static bool IsMultipleProfilesEnabled();
 
  protected:
   // Does final initial actions.
   virtual void DoFinalInit(Profile* profile, bool go_off_the_record);
@@ skipping 67 matching lines @@
 };
 
 // Same as the ProfileManager, but doesn't initialize some services of the
 // profile. This one is useful in unittests.
 class ProfileManagerWithoutInit : public ProfileManager {
  protected:
   virtual void DoFinalInit(Profile*, bool) {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_