GitLab

This rewrite should make MergeDataAndStartSyncing more robust, resulting in fewer underscore dupes and hopefully fewer SyncErrors, as we are more careful about when we send ACTION_UPDATEs during initial merge.

Update unit tests to reflect these changes.

BUG=140732
TEST=Sync two clients with different search engine entries and ensure that they end up in sync. Try to add, update, or remove entries from one client and expect the same to occur on the other.


Review URL: https://chromiumcodereview.appspot.com/10826309

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151569 0039d316-1c4b-4281-b951-d872f2087c98