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

Unified Diff: chrome/test/base/testing_profile.h

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_unittest.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h (revision 111700)
+++ chrome/test/base/testing_profile.h (working copy)
@@ -59,8 +59,15 @@
// for this profile. This constructor is meant to be used by
// TestingProfileManager::CreateTestingProfile. If you need to create multi-
// profile profiles, use that factory method instead of this directly.
+ // Exception: if you need to create multi-profile profiles for testing the
+ // ProfileManager, then use the constructor below instead.
explicit TestingProfile(const FilePath& path);
+ // Multi-profile aware constructor that takes the path to a directory managed
+ // for this profile and a delegate. This constructor is meant to be used
+ // for unittesting the ProfileManager.
+ TestingProfile(const FilePath& path, Delegate* delegate);
+
virtual ~TestingProfile();
// Creates the favicon service. Consequent calls would recreate the service.
@@ -304,6 +311,9 @@
// Common initialization between the two constructors.
void Init();
+ // Finishes initialization when a profile is created asynchronously.
+ void FinishInit();
+
// Destroys favicon service if it has been created.
void DestroyFaviconService();
@@ -413,6 +423,9 @@
// The QuotaManager, only available if set explicitly via SetQuotaManager.
scoped_refptr<quota::QuotaManager> quota_manager_;
+
+ // Weak pointer to a delegate for indicating that a profile was created.
+ Delegate* delegate_;
};
#endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698