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

chrome/browser/search_engines/template_url_service.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/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 1738 matching lines @@
 
   string16 old_keyword(existing_turl->keyword());
   keyword_to_template_map_.erase(old_keyword);
   if (!existing_turl->sync_guid().empty())
     guid_to_template_map_.erase(existing_turl->sync_guid());
 
   provider_map_->Remove(existing_turl, old_search_terms_data);
   TemplateURLID previous_id = existing_turl->id();
   existing_turl->CopyFrom(new_values);
   existing_turl->data_.id = previous_id;
+  UpdatePrepopulatedTemplateURL(existing_turl);
+
   UIThreadSearchTermsData new_search_terms_data(profile_);
   provider_map_->Add(existing_turl, new_search_terms_data);
 
   const string16& keyword = existing_turl->keyword();
   KeywordToTemplateMap::const_iterator i =
       keyword_to_template_map_.find(keyword);
   if (i == keyword_to_template_map_.end()) {
     keyword_to_template_map_[keyword] = existing_turl;
   } else {
     // We can theoretically reach here in two cases:
@@ skipping 29 matching lines @@
                            existing_turl,
                            syncer::SyncChange::ACTION_UPDATE);
 
   if (default_search_provider_ == existing_turl) {
     bool success = SetDefaultSearchProviderNoNotify(existing_turl);
     DCHECK(success);
   }
   return true;
 }
 
+void TemplateURLService::UpdatePrepopulatedTemplateURL(
+    TemplateURL* template_url) {
+  scoped_ptr<TemplateURL> prepopulated_turl(
+      TemplateURLPrepopulateData::MakeTemplateURLFromPrepopulateId(
+          template_url->profile(), template_url->prepopulate_id()));
+  if (prepopulated_turl.get() != NULL) {

[Peter Kasting, 2013/01/30 22:32:33]

Nit: You can remove ".get() != NULL" at this point, I believe

+    TemplateURLID id = template_url->id();
+    string16 short_name = template_url->short_name();
+    string16 keyword = template_url->keyword();
+    template_url->CopyFrom(*prepopulated_turl.get());
+    template_url->data_.short_name = short_name;
+    template_url->data_.SetKeyword(keyword);
+    template_url->data_.id = id;
+  }
+}
+
 PrefService* TemplateURLService::GetPrefs() {
   return profile_ ? profile_->GetPrefs() : NULL;
 }
 
 void TemplateURLService::UpdateKeywordSearchTermsForURL(
     const history::URLVisitedDetails& details) {
   const history::URLRow& row = details.row;
   if (!row.url().is_valid() ||
       !row.url().parsed_for_possibly_invalid_spec().query.is_nonempty()) {
     return;
@@ skipping 310 matching lines @@
   if (url)
     ProcessTemplateURLChange(FROM_HERE,
                              url,
                              syncer::SyncChange::ACTION_UPDATE);
   return true;
 }
 
 bool TemplateURLService::AddNoNotify(TemplateURL* template_url,
                                      bool newly_adding) {
   DCHECK(template_url);
-
+  UpdatePrepopulatedTemplateURL(template_url);
   if (newly_adding) {
     DCHECK_EQ(kInvalidTemplateURLID, template_url->id());
     DCHECK(std::find(template_urls_.begin(), template_urls_.end(),
                      template_url) == template_urls_.end());
     template_url->data_.id = ++next_id_;
   }
 
   template_url->ResetKeywordIfNecessary(false);
   if (!template_url->IsExtensionKeyword()) {
     // Check whether |template_url|'s keyword conflicts with any already in the
@@ skipping 350 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }