chrome/browser/sync/test/integration/two_client_apps_sync_test.cc - Issue 1419823011: app_sorting() calls should go via ExtensionSystem intsead of prefs.

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/sync/test/integration/two_client_apps_sync_test.cc

Issue 1419823011: app_sorting() calls should go via ExtensionSystem intsead of prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« chrome/browser/sync/test/integration/sync_app_list_helper.cc ('K') | « chrome/browser/sync/test/integration/sync_app_list_helper.cc ('k') | chrome/browser/ui/app_list/extension_app_item.cc » ('j') | extensions/browser/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

index b24a7dd9f7c00b9608b3f71b18020c47dcff059e..6478e3a6faa59d9e05bcbe8454370e0f98edc747 100644

--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

@@ -334,14 +334,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {

// Change the app launch ordinal.

syncer::StringOrdinal cws_app_launch_ordinal =

- extensions::ExtensionPrefs::Get(GetProfile(0))

+ extensions::ExtensionSystem::Get(GetProfile(0))

->app_sorting()

->GetAppLaunchOrdinal(extensions::kWebStoreAppId);

- extensions::ExtensionPrefs::Get(GetProfile(0))

+ extensions::ExtensionSystem::Get(GetProfile(0))

->app_sorting()

->SetAppLaunchOrdinal(extensions::kWebStoreAppId,

cws_app_launch_ordinal.CreateAfter());

- extensions::ExtensionPrefs::Get(verifier())

+ extensions::ExtensionSystem::Get(verifier())

->app_sorting()

->SetAppLaunchOrdinal(extensions::kWebStoreAppId,

cws_app_launch_ordinal.CreateAfter());

@@ -349,13 +349,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {

// Change the page ordinal.

syncer::StringOrdinal cws_page_ordinal =

- extensions::ExtensionPrefs::Get(GetProfile(1))

+ extensions::ExtensionSystem::Get(GetProfile(1))

->app_sorting()

->GetPageOrdinal(extensions::kWebStoreAppId);

- extensions::ExtensionPrefs::Get(GetProfile(1))->app_sorting()->SetPageOrdinal(

- extensions::kWebStoreAppId, cws_page_ordinal.CreateAfter());

- extensions::ExtensionPrefs::Get(verifier())->app_sorting()->SetPageOrdinal(

- extensions::kWebStoreAppId, cws_page_ordinal.CreateAfter());

+ extensions::ExtensionSystem::Get(GetProfile(1))

+ ->app_sorting()

+ ->SetPageOrdinal(extensions::kWebStoreAppId,

+ cws_page_ordinal.CreateAfter());

+ extensions::ExtensionSystem::Get(verifier())

+ ->app_sorting()

+ ->SetPageOrdinal(extensions::kWebStoreAppId,

+ cws_page_ordinal.CreateAfter());

ASSERT_TRUE(AwaitAllProfilesHaveSameApps());

}