chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm - 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/ui/cocoa/profiles/profile_menu_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

« no previous file with comments | « chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm ('k') | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

index 26505ffd6bd23787963715260f19fca67e262802..2d15de76c5873dd48698a113b63f308740014cba 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

@@ -20,7 +20,7 @@

#include "chrome/grit/generated_resources.h"

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

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

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

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

#include "testing/gtest_mac.h"

#include "ui/base/l10n/l10n_util_mac.h"

@@ -251,7 +251,7 @@ TEST_F(ProfileMenuControllerTest, DeleteActiveProfile) {

TEST_F(ProfileMenuControllerTest, SupervisedProfile) {

TestingProfileManager* manager = testing_profile_manager();

TestingProfile* supervised_profile = manager->CreateTestingProfile(

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

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

base::ASCIIToUTF16("Supervised User"), 0, "TEST_ID",

TestingProfile::TestingFactories());

// The supervised profile is initially marked as omitted from the avatar menu