Index: chrome/test/base/testing_profile_manager.h |
diff --git a/chrome/test/base/testing_profile_manager.h b/chrome/test/base/testing_profile_manager.h |
index f6ae1f7a5f1a5bed0107ca3e5c07f92329e2fbab..7a4205c3eadf9a0272e006954e5b363c4fa8e91d 100644 |
--- a/chrome/test/base/testing_profile_manager.h |
+++ b/chrome/test/base/testing_profile_manager.h |
@@ -10,9 +10,11 @@ |
#include "base/compiler_specific.h" |
#include "base/files/scoped_temp_dir.h" |
+#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
#include "chrome/test/base/scoped_testing_local_state.h" |
+class PrefServiceSyncable; |
class ProfileInfoCache; |
class ProfileManager; |
class TestingBrowserProcess; |
@@ -38,11 +40,14 @@ class TestingProfileManager { |
// Creates a new TestingProfile whose data lives in a directory related to |
// profile_name, which is a non-user-visible key for the test environment. |
+ // |prefs| is the PrefService used by the profile. If it is NULL, the profile |
+ // creates a PrefService on demand. |
// |user_name| and |avatar_id| are passed along to the ProfileInfoCache and |
// provide the user-visible profile metadata. This will register the |
// TestingProfile with the profile subsystem as well. The subsystem owns the |
// Profile and returns a weak pointer. |
TestingProfile* CreateTestingProfile(const std::string& profile_name, |
+ scoped_ptr<PrefServiceSyncable> prefs, |
const string16& user_name, |
int avatar_id); |