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

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

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « chrome/test/BUILD.gn ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index 7b6deb812202353cd8eb07d92b1853063a36bfc8..f8d5c9ba3c7ef6389cf8d8af38616a77cfb4e935 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -43,7 +43,7 @@ namespace storage {
class SpecialStoragePolicy;
}
-namespace syncable_prefs {
+namespace sync_preferences {
class PrefServiceSyncable;
class TestingPrefServiceSyncable;
}
@@ -100,7 +100,7 @@ class TestingProfile : public Profile {
// Sets the PrefService to be used by this profile.
void SetPrefService(
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs);
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs);
// Makes the Profile being built a guest profile.
void SetGuestSession();
@@ -129,7 +129,7 @@ class TestingProfile : public Profile {
bool build_called_;
// Various staging variables where values are held until Build() is invoked.
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service_;
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> pref_service_;
#if defined(ENABLE_EXTENSIONS)
scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy_;
#endif
@@ -164,7 +164,7 @@ class TestingProfile : public Profile {
#if defined(ENABLE_EXTENSIONS)
scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy,
#endif
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs,
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs,
TestingProfile* parent,
bool guest_session,
const std::string& supervised_user_id,
@@ -208,7 +208,7 @@ class TestingProfile : public Profile {
// Allow setting a profile as Guest after-the-fact to simplify some tests.
void SetGuestSession(bool guest);
- syncable_prefs::TestingPrefServiceSyncable* GetTestingPrefService();
+ sync_preferences::TestingPrefServiceSyncable* GetTestingPrefService();
// Called on the parent of an incognito |profile|. Usually called from the
// constructor of an incognito TestingProfile, but can also be used by tests
@@ -337,9 +337,9 @@ class TestingProfile : public Profile {
protected:
base::Time start_time_;
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs_;
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs_;
// ref only for right type, lifecycle is managed by prefs_
- syncable_prefs::TestingPrefServiceSyncable* testing_prefs_;
+ sync_preferences::TestingPrefServiceSyncable* testing_prefs_;
private:
// Creates a temporary directory for use by this profile.
« no previous file with comments | « chrome/test/BUILD.gn ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698