chrome/chrome_tests.gypi - Issue 9305001: sync: Remove the remaining conflict sets code

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/chrome_tests.gypi

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More renames, refactors and fixes Created 8 years, 11 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:

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 9ed69b4320b5f92934dd34df7ab8a699adf4918e..822c70c8617b0ac831da31698b6dea86e9d848d8 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -3538,7 +3538,6 @@

'browser/sync/api/sync_error_unittest.cc',

'browser/sync/engine/apply_updates_command_unittest.cc',

'browser/sync/engine/build_commit_command_unittest.cc',

- 'browser/sync/engine/build_and_process_conflict_sets_command_unittest.cc',

'browser/sync/engine/clear_data_command_unittest.cc',

'browser/sync/engine/cleanup_disabled_types_command_unittest.cc',

'browser/sync/engine/download_updates_command_unittest.cc',