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

chrome/test/base/testing_profile.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 40 matching lines @@
 }
 
 class TestingProfile : public Profile {
  public:
   // Default constructor that cannot be used with multi-profiles.
   TestingProfile();
 
   // Multi-profile aware constructor that takes the path to a directory managed
   // 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.

[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.
   void CreateFaviconService();
 
   // Creates the history service. If |delete_file| is true, the history file is
   // deleted first, then the HistoryService is created. As TestingProfile
   // deletes the directory containing the files used by HistoryService, this
   // only matters if you're recreating the HistoryService.  If |no_db| is true,
   // the history backend will fail to initialize its database; this is useful
@@ skipping 147 matching lines @@
   virtual SpeechInputPreferences* GetSpeechInputPreferences();
   virtual HostZoomMap* GetHostZoomMap();
   virtual bool HasProfileSyncService() const;
   virtual std::wstring GetName();
   virtual void SetName(const std::wstring& name) {}
   virtual std::wstring GetID();
   virtual void SetID(const std::wstring& id);
   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) {}
   virtual void MergeResourceInteger(int message_id, int* output_value) {}
   virtual void MergeResourceBoolean(int message_id, bool* output_value) {}
   virtual BookmarkModel* GetBookmarkModel();
   virtual bool IsSameProfile(Profile *p);
   virtual base::Time GetStartTime() const;
   virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry();
   virtual SpellCheckHost* GetSpellCheckHost();
@@ skipping 49 matching lines @@
  protected:
   base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
   // ref only for right type, lifecycle is managed by prefs_
   TestingPrefService* testing_prefs_;
 
  private:
   // 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();
 
   // If the webdata service has been created, it is destroyed.  This is invoked
   // from the destructor.
   void DestroyWebDataService();
 
   // Creates a TestingPrefService and associates it with the TestingProfile.
   void CreateTestingPrefService();
 
@@ skipping 33 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> extensions_request_context_;
 
   std::wstring id_;
 
   bool incognito_;
   scoped_ptr<Profile> incognito_profile_;
 
   // 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_;
 
   // WebKitContext, lazily initialized by GetWebKitContext().
   scoped_refptr<WebKitContext> webkit_context_;
 
   // The main database tracker for this profile.
   // Should be used only on the file thread.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
@@ skipping 36 matching lines @@
 
   // We keep a weak pointer to the dependency manager we want to notify on our
   // death. Defaults to the Singleton implementation but overridable for
   // testing.
   ProfileDependencyManager* profile_dependency_manager_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
 
   // 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_