[sync] Search engine shortcuts get underscores at the end after sync

components/search_engines/template_url_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 607 matching lines @@
   // known to the local model (though it may already be synced), and |sync_turl|
   // is a new TemplateURL known to Sync but not yet known to the local model.
   // The criteria for if |local_turl| is better than |sync_turl| is whether any
   // of the following are true:
   //  * |local_turl|'s last_modified timestamp is newer than sync_turl.
   //  * |local_turl| is created by policy.
   //  * |local_turl| is the local default search provider.
   bool IsLocalTemplateURLBetter(const TemplateURL* local_turl,
                                 const TemplateURL* sync_turl);
 
+  // Returns true iff |local_turl| is considered "better" than |sync_turl| for
+  // the purposes of resolving a conflicting prepopulate_id. |local_turl| must
+  // be a TemplateURL known to the local model (though it may already be
+  // synced), and |sync_turl| is a new TemplateURL known to Sync but not yet
+  // known to the local model.
+  // The criteria for if |local_turl| is better than |sync_turl| is whether
+  // either of the following is true:
+  //  * |local_turl|'s last_modified timestamp is newer than sync_turl.
+  //  * |local_turl| is created by policy.
+  // Note that even if the local turl is the default search provider, the remote
+  // url can still be considered better.
+  bool IsLocalPrepopulatedTemplateURLBetter(const TemplateURL* local_turl,
+                                            const TemplateURL* sync_turl);

[Peter Kasting, 2016/06/14 19:21:26]

Nit: I'd combine these two functions into one and pass it a third argument, bool
prefer_local_default, that would toggle between the two behaviors.

This allows you to avoid copy and pasting the whole long comment, and share the
(admittedly brief) implementations of the two functions.

[Patrick Noland, 2016/06/14 22:55:24]

Done.

+
   // Given two synced TemplateURLs with a conflicting keyword, one of which
   // needs to be added to or updated in the local model (|unapplied_sync_turl|)
   // and one which is already known to the local model (|applied_sync_turl|),
   // prepares the local model so that |unapplied_sync_turl| can be added to it,
   // or applied as an update to an existing TemplateURL.
   // Since both entries are known to Sync and one of their keywords will change,
   // an ACTION_UPDATE will be appended to |change_list| to reflect this change.
   // Note that |applied_sync_turl| must not be an extension keyword.
   void ResolveSyncKeywordConflict(TemplateURL* unapplied_sync_turl,
                                   TemplateURL* applied_sync_turl,
@@ skipping 181 matching lines @@
   // Helper class to manage the default search engine.
   DefaultSearchManager default_search_manager_;
 
   std::unique_ptr<GoogleURLTracker::Subscription>
       google_url_updated_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_