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

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm

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/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index 2e1bc65b9041b3bda18f1fb77df02a0ec93d5c02..69af42c90f4be49fcdc3399041090b174f9cd074 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -34,7 +34,7 @@
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/common/profile_management_switches.h"
#include "components/signin/core/common/signin_pref_names.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
+#include "components/sync_preferences/pref_service_syncable.h"
const std::string kGaiaId = "gaiaid-user@gmail.com";
const std::string kEmail = "user@gmail.com";
@@ -64,10 +64,10 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
browser()->profile(), gcm::FakeGCMProfileService::Build);
testing_profile_manager()->CreateTestingProfile(
- "test1", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test1", std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
base::ASCIIToUTF16("Test 1"), 0, std::string(), testing_factories());
testing_profile_manager()->CreateTestingProfile(
- "test2", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test2", std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
base::ASCIIToUTF16("Test 2"), 1, std::string(),
TestingProfile::TestingFactories());
@@ -317,11 +317,11 @@ TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
// Add two extra profiles, to make sure sorting is alphabetical and not
// by order of creation.
testing_profile_manager()->CreateTestingProfile(
- "test3", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test3", std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
base::ASCIIToUTF16("New Profile"), 1, std::string(),
TestingProfile::TestingFactories());
testing_profile_manager()->CreateTestingProfile(
- "test4", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
+ "test4", std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
base::ASCIIToUTF16("Another Test"), 1, std::string(),
TestingProfile::TestingFactories());
StartFastUserSwitcher();

Powered by Google App Engine
This is Rietveld 408576698