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

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

Issue 7621066: Fix sync test crashing when multiprofiles are enabled on Mac. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months 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
Index: chrome/browser/profiles/profile_manager.h
===================================================================
--- chrome/browser/profiles/profile_manager.h (revision 97284)
+++ chrome/browser/profiles/profile_manager.h (working copy)
@@ -30,7 +30,7 @@
class ProfileManagerObserver {
public:
enum Status {
- // So epic.
+ // Profile creation has failed.
STATUS_FAIL,
// Profile created but before initializing extensions and promo resources.
STATUS_CREATED,
@@ -167,13 +167,16 @@
// Checks if multiple profiles is enabled.
static bool IsMultipleProfilesEnabled();
+ // 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 only. If |addToCache|, add to ProfileInfoCache as well.
+ void RegisterTestingProfile(Profile* profile, bool addToCache);
+
protected:
// Does final initial actions.
virtual void DoFinalInit(Profile* profile, bool go_off_the_record);
private:
- friend class ExtensionEventRouterForwarderTest;
-
// This struct contains information about profiles which are being loaded or
// were loaded.
struct ProfileInfo {
« no previous file with comments | « chrome/browser/extensions/extension_event_router_forwarder_unittest.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698