Ensure post-sync TemplateURL of prepopulated engines use built-in version.

chrome/browser/search_engines/util.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/search_engines/util.h"
 
 #include <set>
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 117 matching lines @@
     int64 id) {
   for (TemplateURLService::TemplateURLVector::const_iterator i(
        template_urls.begin()); i != template_urls.end(); ++i) {
     if ((*i)->id() == id) {
       return *i;
     }
   }
   return NULL;
 }
 
+void MergeIntoPrepopulatedEngineData(TemplateURLData* prepopulated_url,
+                                     const TemplateURL* original_turl) {
+  DCHECK(original_turl->prepopulate_id() == prepopulated_url->prepopulate_id);

[Peter Kasting, 2013/02/01 22:47:06]

Nit: DCHECK_EQ

+  if (!original_turl->safe_for_autoreplace()) {
+    prepopulated_url->safe_for_autoreplace = false;
+    prepopulated_url->SetKeyword(original_turl->keyword());
+    prepopulated_url->short_name = original_turl->short_name();
+  }
+  prepopulated_url->id = original_turl->id();
+  prepopulated_url->sync_guid = original_turl->sync_guid();
+}
+
 // Loads engines from prepopulate data and merges them in with the existing
 // engines.  This is invoked when the version of the prepopulate data changes.
 // If |removed_keyword_guids| is not NULL, the Sync GUID of each item removed
 // from the DB will be added to it.  Note that this function will take
 // ownership of |prepopulated_urls| and will clear the vector.
 void MergeEnginesFromPrepopulateData(
     Profile* profile,
     WebDataService* service,
     ScopedVector<TemplateURL>* prepopulated_urls,
     size_t default_search_index,
@@ skipping 28 matching lines @@
     DCHECK_NE(0, prepopulated_id);
 
     TemplateURL* url_in_vector = NULL;
     IDMap::iterator existing_url_iter(id_to_turl.find(prepopulated_id));
     if (existing_url_iter != id_to_turl.end()) {
       // Update the data store with the new prepopulated data.  Preserve user
       // edits to the name and keyword.
       TemplateURLData data(prepopulated_url->data());
       scoped_ptr<TemplateURL> existing_url(existing_url_iter->second);
       id_to_turl.erase(existing_url_iter);
-      if (!existing_url->safe_for_autoreplace()) {
-        data.safe_for_autoreplace = false;
-        data.SetKeyword(existing_url->keyword());
-        data.short_name = existing_url->short_name();
-      }
-      data.id = existing_url->id();
+      MergeIntoPrepopulatedEngineData(&data, existing_url.get());
       // Update last_modified to ensure that if this entry is later merged with
       // entries from Sync, the conflict resolution logic knows that this was
       // updated and propagates the new values to the server.
       data.last_modified = base::Time::Now();
-      data.sync_guid = existing_url->sync_guid();
       if (service)
         service->UpdateKeyword(data);
 
       // Replace the entry in |template_urls| with the updated one.
       TemplateURLService::TemplateURLVector::iterator j = std::find(
           template_urls->begin(), template_urls->end(), existing_url.get());
       *j = new TemplateURL(profile, data);
       url_in_vector = *j;
       if (*default_search_provider == existing_url.get())
         *default_search_provider = url_in_vector;
@@ skipping 96 matching lines @@
   std::vector<std::string> deduped_encodings;
   std::set<std::string> encoding_set;
   for (std::vector<std::string>::const_iterator i(encodings->begin());
        i != encodings->end(); ++i) {
     if (encoding_set.insert(*i).second)
       deduped_encodings.push_back(*i);
   }
   encodings->swap(deduped_encodings);
   return encodings->size() != deduped_encodings.size();
 }