diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-18 02:47:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 09:48:29 +0000 |
| commit | 50c1e529587af459c14828ebe48d2e018d4b8e98 (patch) | |
| tree | fce899626a1def4c171c4e348101d67746058eca /chrome/test/base/testing_profile.cc | |
| parent | c956799bbab4a8ef3c3f223f5179847a89d2eda1 (diff) | |
| download | chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.zip chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.tar.gz chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.tar.bz2 | |
Add syncable_prefs namespace.
Move all the code in the syncable_prefs components into the namespace
syncable_prefs and fix usage.
Change automated with tools/git/mffr.py with manual fixes for the
class forward-declaration.
BUG=520542
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1353913003
Cr-Commit-Position: refs/heads/master@{#349638}
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index ac2177f..7b31c30 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -309,7 +309,7 @@ TestingProfile::TestingProfile( #if defined(ENABLE_EXTENSIONS) scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy, #endif - scoped_ptr<PrefServiceSyncable> prefs, + scoped_ptr<syncable_prefs::PrefServiceSyncable> prefs, TestingProfile* parent, bool guest_session, const std::string& supervised_user_id, @@ -633,7 +633,8 @@ scoped_refptr<base::SequencedTaskRunner> TestingProfile::GetIOTaskRunner() { return base::MessageLoop::current()->task_runner(); } -TestingPrefServiceSyncable* TestingProfile::GetTestingPrefService() { +syncable_prefs::TestingPrefServiceSyncable* +TestingProfile::GetTestingPrefService() { DCHECK(prefs_); DCHECK(testing_prefs_); return testing_prefs_; @@ -734,7 +735,7 @@ net::CookieMonster* TestingProfile::GetCookieMonster() { void TestingProfile::CreateTestingPrefService() { DCHECK(!prefs_.get()); - testing_prefs_ = new TestingPrefServiceSyncable(); + testing_prefs_ = new syncable_prefs::TestingPrefServiceSyncable(); prefs_.reset(testing_prefs_); user_prefs::UserPrefs::Set(this, prefs_.get()); chrome::RegisterUserProfilePrefs(testing_prefs_->registry()); @@ -989,7 +990,7 @@ void TestingProfile::Builder::SetExtensionSpecialStoragePolicy( #endif void TestingProfile::Builder::SetPrefService( - scoped_ptr<PrefServiceSyncable> prefs) { + scoped_ptr<syncable_prefs::PrefServiceSyncable> prefs) { pref_service_ = prefs.Pass(); } |