Rewrite TemplateURLService's SyncableService implmentation to avoid sending ACTION_DELETEs to Sync.

Rewrite TemplateURLService's SyncableService implmentation to avoid sending ACTION_DELETEs to Sync.

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.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=151569

[SteveT, 2012-08-14 16:58:18]

Hey Nick - I had to revert my patch from yesterday due to a leak in my new test.
I've fixed it now (see diff between the first and second patchsets).

I've tried this earlier (http://codereview.chromium.org/10827319/) and the
linux_valgrind results look better (fixed by leak but revealed another leak
that's been there for 2 days).

PTAL at the fix diff.

[Nicolas Zea, 2012-08-14 17:07:44]

lgtm

[Peter Kasting, 2012-08-14 17:47:06]

https://chromiumcodereview.appspot.com/10826309/diff/2001/chrome/browser/sear...
File chrome/browser/search_engines/template_url_service.cc (right):

https://chromiumcodereview.appspot.com/10826309/diff/2001/chrome/browser/sear...
chrome/browser/search_engines/template_url_service.cc:202: return
(sync_data.find(turl->sync_guid()) != sync_data.end());
Nit: You can use !!sync_data.count(turl->sync_guid()) or similar here.

[SteveT, 2012-08-14 19:15:10]

Addressed Peter's nit.

Valgrind is looking better (my failure is gone, though there seems to be other
issues on that bot), so I'll commit this and see if we do better this time on
the waterfall.

https://chromiumcodereview.appspot.com/10826309/diff/2001/chrome/browser/sear...
File chrome/browser/search_engines/template_url_service.cc (right):

https://chromiumcodereview.appspot.com/10826309/diff/2001/chrome/browser/sear...
chrome/browser/search_engines/template_url_service.cc:202: return
(sync_data.find(turl->sync_guid()) != sync_data.end());
On 2012/08/14 17:47:06, Peter Kasting wrote:
> Nit: You can use !!sync_data.count(turl->sync_guid()) or similar here.

Done.

[commit-bot: I haz the power, 2012-08-14 19:15:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stevet@chromium.org/10826309/4002

[commit-bot: I haz the power, 2012-08-14 21:32:53]

Change committed as 151569