chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc - Issue 981893002: Lazily build the app list model.

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_app_list_sync_test.cc

Issue 981893002: Lazily build the app list model. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_set_enabled

Patch Set: revert ALSL Created 5 years, 9 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/sync/test/integration/sync_app_list_helper.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9555da4c8eb2c9c3e9680243107b3c29e924fa3b..79cb879f1d8b90eb78658ebdfa9cd7b497ef6fa6 100644

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

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

@@ -63,7 +63,7 @@ void CheckAppInfoInPrefs(Profile* profile,

for (auto id : expected_ids) {

app_list::AppListItem* item =

- service->model()->top_level_item_list()->FindItem(id);

+ service->GetModel()->top_level_item_list()->FindItem(id);

ASSERT_TRUE(item);

// Ensure local prefs matches the model data.

scoped_ptr<app_list::AppListPrefs::AppListInfo> info =

@@ -530,7 +530,7 @@ class TwoClientAppListSyncFolderTest : public TwoClientAppListSyncTest {

bool res = TwoClientAppListSyncTest::SetupClients();

app_list::AppListSyncableService* verifier_service =

app_list::AppListSyncableServiceFactory::GetForProfile(verifier());

- verifier_service->model()->SetFoldersEnabled(true);

+ verifier_service->GetModel()->SetFoldersEnabled(true);

return res;

}