Refactor ProfileManager::DoFinalInit(...) to allow for a more flexible ProfileManagerWithoutInit....

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
 
@@ skipping 177 matching lines @@
   // Register and add testing profile to the ProfileManager. Use ONLY in tests.
   // This allows the creation of Profiles outside of the standard creation path
   // for testing. If |addToCache|, add to ProfileInfoCache as well.
   void RegisterTestingProfile(Profile* profile, bool addToCache);
 
   const FilePath& user_data_dir() const { return user_data_dir_; }
 
  protected:
   // Does final initial actions.
   virtual void DoFinalInit(Profile* profile, bool go_off_the_record);
+  virtual void DoFinalServicesInit(Profile* profile, bool go_off_the_record);
+  virtual void DoFinalInitLogging(Profile* profile);
 
   // Creates a new profile. Virtual so that unittests can return TestingProfile.
   virtual Profile* CreateProfile(const FilePath& path);
 
  private:
   friend class TestingProfileManager;
   FRIEND_TEST(ProfileManagerBrowserTest, DeleteAllProfiles);
 
   // This struct contains information about profiles which are being loaded or
   // were loaded.
@@ skipping 70 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ProfileManager);
 };
 
 // Same as the ProfileManager, but doesn't initialize some services of the
 // profile. This one is useful in unittests.
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const FilePath& user_data_dir);
 
  protected:
-  virtual void DoFinalInit(Profile*, bool) {}
+  virtual void DoFinalServicesInit(Profile*, bool) {}

[Robert Sesek, 2011/11/09 19:07:46]

OVERRIDE on both of these

+  virtual void DoFinalInitLogging(Profile*) {}

[Robert Sesek, 2011/11/09 19:07:46]

I'd standardize the naming here. Either DoFinalInit(For)Services or
DoFinalServicesInit. I prefer the former.

 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_