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

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 447 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
   // Only keep track of profiles that we are managing; tests may create others.
   if (profiles_info_.find(last_active->GetPath()) != profiles_info_.end()) {
     local_state->SetString(prefs::kProfileLastUsed,
                            last_active->GetPath().BaseName().MaybeAsASCII());
   }
 }
 
 void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
+  DoFinalServicesInit(profile, go_off_the_record);
+  AddProfileToCache(profile);
+

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

nit: remove

+  DoFinalInitLogging(profile);
+}
+
+void ProfileManager::DoFinalServicesInit(Profile* profile,
+                                         bool go_off_the_record) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   profile->InitExtensions(!go_off_the_record);
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
-  AddProfileToCache(profile);
+}
 
+void ProfileManager::DoFinalInitLogging(Profile* profile) {
   // Log the profile size after a reasonable startup delay.
   BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
                                  new ProfileSizeTask(profile), 112000);
 }
 
 Profile* ProfileManager::CreateProfile(const FilePath& path) {
   return Profile::CreateProfile(path);
 }
 
 void ProfileManager::OnProfileCreated(Profile* profile, bool success) {
@@ skipping 185 matching lines @@
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_cache) {
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }