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

chrome/test/base/testing_profile.h

Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h	(revision 110703)
+++ chrome/test/base/testing_profile.h	(working copy)
@@ -61,6 +61,11 @@
   // profile profiles, use that factory method instead of this directly.

[Miranda Callahan, 2011/11/21 15:31:31]

The comment here says that for multi-profile testing we should use the factory
method -- is this also applicable for the constructor below? (If so, can you add
the comment here?)

[rpetterson, 2011/11/21 22:59:30]

This comment isn't actually applicable here either because it requires a
TestingProfileManager and we're trying to test the ProfileManager (so using a
TestingProfileManager would be contrary to that purpose). I've added a comment
that the new function should be used when testing the ProfileManager.

   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.
@@ -228,6 +233,9 @@
   void set_last_session_exited_cleanly(bool value) {
     last_session_exited_cleanly_ = value;
   }
+  void set_enable_lazy_service_initialization(bool value) {
+    enable_lazy_service_initialization_ = value;
+  }
   virtual bool DidLastSessionExitCleanly();
   virtual void MergeResourceString(int message_id,
                                    std::wstring* output_string) {}
@@ -297,6 +305,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();
 
@@ -350,6 +361,9 @@
   // Did the last session exit cleanly? Default is true.
   bool last_session_exited_cleanly_;
 
+  // Do we create services if they do not exist? Default is false.
+  bool enable_lazy_service_initialization_;
+
   // FileSystemContext.  Created lazily by GetFileSystemContext().
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
@@ -406,6 +420,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_