Fixing ProfileManagerTest to use the TestingProfile instead of a real profile. This will allow ea...

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 304 matching lines @@
   return profiles;
 }
 
 Profile* ProfileManager::GetProfile(const FilePath& profile_dir) {
   // If the profile is already loaded (e.g., chrome.exe launched twice), just
   // return it.
   Profile* profile = GetProfileByPath(profile_dir);
   if (NULL != profile)
     return profile;
 
-  profile = CreateProfile(profile_dir);
+  profile = CreateProfileHelper(profile_dir);
   DCHECK(profile);
   if (profile) {
     bool result = AddProfile(profile);
     DCHECK(result);
   }
   return profile;
 }
 
 void ProfileManager::CreateProfileAsync(const FilePath& user_data_dir,
                                         ProfileManagerObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ProfilesInfoMap::iterator iter = profiles_info_.find(user_data_dir);
   if (iter != profiles_info_.end()) {
     ProfileInfo* info = iter->second.get();
     if (info->created) {
       // Profile has already been created. Call observer immediately.
       observer->OnProfileCreated(
           info->profile.get(), ProfileManagerObserver::STATUS_INITIALIZED);
       if (observer->DeleteAfter())
         delete observer;
     } else {
       // Profile is being created. Add observer to list.
       info->observers.push_back(observer);
     }
   } else {
     // Initiate asynchronous creation process.
     ProfileInfo* info =
-        RegisterProfile(Profile::CreateProfileAsync(user_data_dir, this),
+        RegisterProfile(CreateProfileAsyncHelper(user_data_dir, this),
                         false);
     info->observers.push_back(observer);
   }
 }
 
 // static
 void ProfileManager::CreateDefaultProfileAsync(
     ProfileManagerObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ skipping 115 matching lines @@
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
 }
 
 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) {
+Profile* ProfileManager::CreateProfileHelper(const FilePath& path) {
   return Profile::CreateProfile(path);
 }
 
+Profile* ProfileManager::CreateProfileAsyncHelper(const FilePath& path,
+                                                  Delegate* delegate) {
+  return Profile::CreateProfileAsync(path, delegate);
+}
+
 void ProfileManager::OnProfileCreated(Profile* profile, bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ProfilesInfoMap::iterator iter = profiles_info_.find(profile->GetPath());
   DCHECK(iter != profiles_info_.end());
   ProfileInfo* info = iter->second.get();
 
   std::vector<ProfileManagerObserver*> observers;
   info->observers.swap(observers);
 
@@ skipping 202 matching lines @@
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }
 
 #if defined(OS_WIN)
 void ProfileManager::RemoveProfileShortcutManagerForTesting() {
   profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
 }
 #endif