Ensure that MergeDataAndStartSyncing considers already synced entries when setting the synced DSP.

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
===================================================================
--- chrome/browser/search_engines/template_url_service.cc	(revision 151691)
+++ chrome/browser/search_engines/template_url_service.cc	(working copy)
@@ -1155,6 +1155,10 @@
                                local_data_map[local_turl->sync_guid()]));
       }
       local_data_map.erase(iter->first);
+
+      // Attempt to reset the default search provider incase it was changed

[Nicolas Zea, 2012/08/15 21:46:28]

incase -> in case

[SteveT, 2012/08/15 21:56:57]

Done.

+      // since the last time search engines was synced.
+      SetDefaultSearchProviderIfNewlySynced(local_turl->sync_guid());

[Nicolas Zea, 2012/08/15 22:26:03]

Would moving this to the end of MergeData and calling GetPendingSyncedDefault
instead make more sense? Seems like it's not a per-url check you need, but just
a "did we have a pending, does it exist now, if so set it" flow, much like in
the OnWebDBRequestDone

[SteveT, 2012/08/16 19:50:53]

That makes a lot of sense for MergeDataAndStartSyncing, and I've made the
changes to reflect this.

     } else {
       // The search engine from the cloud has not been synced locally. Merge it
       // into our local model. This will handle any conflicts with local (and