chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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/policy/user_cloud_policy_manager_chromeos_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/policy/recommendation_restorer_unittest.cc ('k') | chrome/browser/chromeos/power/power_prefs_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

index b67fc78e4c830e519066f60427134d3f7fab40ef..76ca8ed181cd0753e4ec526306cfd807c130ed4a 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

@@ -41,7 +41,7 @@

#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

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

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

#include "components/user_manager/fake_user_manager.h"

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

#include "google_apis/gaia/gaia_auth_consumer.h"

@@ -102,7 +102,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {

BuildFakeProfileOAuth2TokenService));

profile_ = profile_manager_->CreateTestingProfile(

chrome::kInitialProfile,

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

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

base::UTF8ToUTF16(""), 0, std::string(), factories);

// Usually the signin Profile and the main Profile are separate, but since

// the signin Profile is an OTR Profile then for this test it suffices to