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

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

Issue 16658015: Add device policies to control accessibility settings on the login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copy&paste mistake found by clang. Created 7 years, 6 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/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..86cec1c671d5ee95450232a314b94bf66ff62947 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 pref store used by the profile. If it is NULL, the profile
+ // creates a pref store on demand.
Mattias Nissler (ping if slow) 2013/06/12 13:55:16 s/pref store/PrefService/
bartfab (slow) 2013/06/12 18:57:49 Done.
// |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);

Powered by Google App Engine
This is Rietveld 408576698