chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc - Issue 2328393002: [Sync] Add a sanity integration test for USS.

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/single_client_extensions_sync_test.cc

Issue 2328393002: [Sync] Add a sanity integration test for USS. (Closed)

Patch Set: Rebase. Created 4 years, 3 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/single_client_bookmarks_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_uss_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8c9deee653e5998ae97615585eed1608f9d15691..75fa9876b07d434ba525fbe3f149eb3b8e8dd2cf 100644

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

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

@@ -82,9 +82,10 @@ IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest, UninstallWinsConflicts) {

std::vector<sync_pb::SyncEntity> server_extensions =

GetFakeServer()->GetSyncEntitiesByModelType(syncer::EXTENSIONS);

ASSERT_EQ(1ul, server_extensions.size());

- std::string entity_id = server_extensions[0].id_string();

std::unique_ptr<fake_server::FakeServerEntity> tombstone(

- fake_server::TombstoneEntity::Create(entity_id));

+ fake_server::TombstoneEntity::Create(

+ server_extensions[0].id_string(),

+ server_extensions[0].client_defined_unique_tag()));

GetFakeServer()->InjectEntity(std::move(tombstone));

// Modify the extension in the local profile to cause a conflict.