Retroactively addressed sky@'s comments from CL http://codereview.chromium.org/7566036/

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
===================================================================
--- chrome/browser/search_engines/template_url_service.h	(revision 99124)
+++ chrome/browser/search_engines/template_url_service.h	(working copy)
@@ -129,8 +129,7 @@
   // retains ownership of it.
   const TemplateURL* GetTemplateURLForKeyword(const string16& keyword) const;
 
-  // Looks up |sync_guid| and returns the element it maps to.  Returns NULL if
-  // the guid was not found.
+  // Returns that TemplateURL with the specified GUID, or NULL if not found.
   // The caller should not try to delete the returned pointer; the data store

[SteveT, 2011/09/01 14:21:54]

sky 2011/08/17 23:22:29
nit: Returns the TemplateURL with the specified guid, or NULL if not found.

stevet: Done.

   // retains ownership of it.
   const TemplateURL* GetTemplateURLForGUID(const std::string& sync_guid) const;
@@ -472,8 +471,8 @@
   // it is unique to the Service.
   string16 UniquifyKeyword(const TemplateURL& turl) const;
 
-  // Given a TemplateURL from Sync, resolves any keyword conflicts by checking

[SteveT, 2011/09/01 14:21:54]

sky 2011/08/17 23:22:29
nit: add (cloud) after Sync.

stevet: Done.

-  // the local keywords and uniquifying either the cloud keyword or a
+  // Given a TemplateURL from Sync (cloud), resolves any keyword conflicts by
+  // checking the local keywords and uniquifying either the cloud keyword or a
   // conflicting local keyword (whichever is older). If the cloud TURL is
   // changed, then an appropriate SyncChange is appended to |change_list|. If
   // a local TURL is changed, the service is updated with the new keyword. If
@@ -481,7 +480,7 @@
   // last_modified dates, |sync_turl| wins. Returns true iff there was a
   // conflict.
   bool ResolveSyncKeywordConflict(TemplateURL* sync_turl,
-                                  SyncChangeList& change_list);

[SteveT, 2011/09/01 14:21:54]

sky 2011/08/17 23:22:29
Because this may modify change_list, it should be a pointer.

stevet: Done.

+                                  SyncChangeList* change_list);
 
   // Returns a TemplateURL from the service that has the same keyword and search
   // URL as |sync_turl|, if it exists.
@@ -497,7 +496,7 @@
   // if it is newer, so the caller must release it if need be.
   void MergeSyncAndLocalURLDuplicates(TemplateURL* sync_url,
                                       TemplateURL* local_url,
-                                      SyncChangeList& change_list);

[SteveT, 2011/09/01 14:21:54]

sky 2011/08/17 23:22:29
change_list should be a pointer here too.

stevet: Done.

+                                      SyncChangeList* change_list);
 
   NotificationRegistrar registrar_;