Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5798)

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 8565032: Fixing ProfileManagerTest to use the TestingProfile instead of a real profile. This will allow ea... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager.cc
===================================================================
--- chrome/browser/profiles/profile_manager.cc (revision 111700)
+++ chrome/browser/profiles/profile_manager.cc (working copy)
@@ -322,7 +322,7 @@
if (NULL != profile)
return profile;
- profile = CreateProfile(profile_dir);
+ profile = CreateProfileHelper(profile_dir);
DCHECK(profile);
if (profile) {
bool result = AddProfile(profile);
@@ -350,7 +350,7 @@
} 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);
}
@@ -486,10 +486,15 @@
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));
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698