chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc - Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_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/chromeos/input_method/input_method_syncer.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

index cb7cd91d6a97d86ce7ad58e0a0ebb636938b48e1..d8354aaa65cf14de919c37f225d9687a431ac378 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

@@ -22,7 +22,7 @@

#include "chrome/test/base/testing_profile_manager.h"

#include "components/prefs/scoped_user_pref_update.h"

#include "components/prefs/testing_pref_service.h"

-#include "components/syncable_prefs/testing_pref_service_syncable.h"

+#include "components/sync_preferences/testing_pref_service_syncable.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "crypto/scoped_test_nss_chromeos_user.h"

@@ -207,14 +207,14 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {

signin_profile_ = profile_manager_.CreateTestingProfile(

chrome::kInitialProfile,

- std::unique_ptr<syncable_prefs::TestingPrefServiceSyncable>(),

+ std::unique_ptr<sync_preferences::TestingPrefServiceSyncable>(),

base::UTF8ToUTF16(chrome::kInitialProfile), 0 /* avatar id */,

std::string() /* supervized user id */,

TestingProfile::TestingFactories());

user_profile_ = profile_manager_.CreateTestingProfile(

test_account_id_.GetUserEmail(),

- std::unique_ptr<syncable_prefs::TestingPrefServiceSyncable>(),

+ std::unique_ptr<sync_preferences::TestingPrefServiceSyncable>(),

base::UTF8ToUTF16(test_account_id_.GetUserEmail()), 0 /* avatar id */,

std::string() /* supervized user id */,

TestingProfile::TestingFactories());