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

Unified Diff: chrome/browser/signin/cross_device_promo_unittest.cc

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
Index: chrome/browser/signin/cross_device_promo_unittest.cc
diff --git a/chrome/browser/signin/cross_device_promo_unittest.cc b/chrome/browser/signin/cross_device_promo_unittest.cc
index 05e21a50f7d1c1e6ef9707c396adb69c7fff18c1..611fe7aaa7f671ef4bba350516301f7b809aaa7a 100644
--- a/chrome/browser/signin/cross_device_promo_unittest.cc
+++ b/chrome/browser/signin/cross_device_promo_unittest.cc
@@ -31,8 +31,8 @@
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_metrics.h"
#include "components/signin/core/browser/test_signin_client.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
-#include "components/syncable_prefs/testing_pref_service_syncable.h"
+#include "components/sync_preferences/pref_service_syncable.h"
+#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "components/variations/entropy_provider.h"
#include "components/variations/variations_associated_data.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -100,7 +100,9 @@ class CrossDevicePromoTest : public ::testing::Test {
TestingProfile* profile() { return profile_; }
FakeSigninManagerForTesting* signin_manager() { return signin_manager_; }
base::HistogramTester* histogram_tester() { return &histogram_tester_; }
- syncable_prefs::TestingPrefServiceSyncable* prefs() { return pref_service_; }
+ sync_preferences::TestingPrefServiceSyncable* prefs() {
+ return pref_service_;
+ }
FakeGaiaCookieManagerService* cookie_manager_service() {
return cookie_manager_service_;
}
@@ -114,7 +116,7 @@ class CrossDevicePromoTest : public ::testing::Test {
TestingProfile* profile_;
FakeSigninManagerForTesting* signin_manager_;
FakeGaiaCookieManagerService* cookie_manager_service_;
- syncable_prefs::TestingPrefServiceSyncable* pref_service_;
+ sync_preferences::TestingPrefServiceSyncable* pref_service_;
std::unique_ptr<TestingProfileManager> testing_profile_manager_;
base::HistogramTester histogram_tester_;
std::unique_ptr<base::FieldTrialList> field_trial_list_;
@@ -141,12 +143,12 @@ void CrossDevicePromoTest::SetUp() {
factories.push_back(std::make_pair(SigninManagerFactory::GetInstance(),
BuildFakeSigninManagerBase));
- pref_service_ = new syncable_prefs::TestingPrefServiceSyncable();
+ pref_service_ = new sync_preferences::TestingPrefServiceSyncable();
chrome::RegisterUserProfilePrefs(pref_service_->registry());
profile_ = testing_profile_manager_.get()->CreateTestingProfile(
"name",
- base::WrapUnique<syncable_prefs::PrefServiceSyncable>(pref_service_),
+ base::WrapUnique<sync_preferences::PrefServiceSyncable>(pref_service_),
base::UTF8ToUTF16("name"), 0, std::string(), factories);
cookie_manager_service_ = static_cast<FakeGaiaCookieManagerService*>(
« no previous file with comments | « chrome/browser/signin/cross_device_promo_factory.cc ('k') | chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698