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

Unified Diff: chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_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
« no previous file with comments | « chrome/browser/ui/webui/signin/signin_create_profile_handler_unittest.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc
index fec077372376cf1c7bbb6e5e8f85c4c250dc0821..e71153c8110c014cb17857277dbafb96dfe8e6f2 100644
--- a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc
+++ b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc
@@ -22,7 +22,7 @@
#include "components/sync/model/fake_sync_change_processor.h"
#include "components/sync/model/sync_error_factory_mock.h"
#include "components/sync/protocol/sync.pb.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
+#include "components/sync_preferences/pref_service_syncable.h"
#include "content/public/test/test_web_ui.h"
#include "ui/base/l10n/l10n_util.h"
@@ -84,11 +84,8 @@ class SigninSupervisedUserImportHandlerTest : public BrowserWithTestWindowTest {
BuildFakeSigninManagerBase));
profile_ = profile_manager_.get()->CreateTestingProfile(
"test-profile",
- std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
- base::UTF8ToUTF16("test-profile"),
- 0,
- std::string(),
- factories);
+ std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
+ base::UTF8ToUTF16("test-profile"), 0, std::string(), factories);
// Authenticate the test profile.
fake_signin_manager_ = static_cast<FakeSigninManagerForTesting*>(
@@ -219,9 +216,8 @@ TEST_F(SigninSupervisedUserImportHandlerTest, CustodianIsSupervised) {
// Build a supervised test profile.
TestingProfile* profile_ = profile_manager()->CreateTestingProfile(
"supervised-test-profile",
- std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
- base::UTF8ToUTF16("supervised-test-profile"),
- 0,
+ std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
+ base::UTF8ToUTF16("supervised-test-profile"), 0,
"12345", // supervised_user_id
TestingProfile::TestingFactories());
« no previous file with comments | « chrome/browser/ui/webui/signin/signin_create_profile_handler_unittest.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698