De-dupe input encodings in TemplateURLs.

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 239 matching lines @@
   DCHECK(template_urls->empty());
   DCHECK(default_search_provider);
   DCHECK(*default_search_provider == NULL);
   DCHECK_EQ(KEYWORDS_RESULT, result.GetType());
   DCHECK(new_resource_keyword_version);
 
   *new_resource_keyword_version = 0;
   WDKeywordsResult keyword_result = reinterpret_cast<
       const WDResult<WDKeywordsResult>*>(&result)->GetValue();
 
-  for (KeywordTable::Keywords::const_iterator i(
-       keyword_result.keywords.begin()); i != keyword_result.keywords.end();
-       ++i)
+  for (KeywordTable::Keywords::iterator i(keyword_result.keywords.begin());
+       i != keyword_result.keywords.end(); ++i) {
+    // Fix any duplicate encodings in the local database.  Note that we don't
+    // adjust the last_modified time of this keyword; this way, we won't later
+    // overwrite any changes on the sync server that happened to this keyword
+    // since the last time we synced.  Instead, we also run a de-duping pass on
+    // the server-provided data in
+    // TemplateURLService::CreateTemplateURLFromTemplateURLAndSyncData() and
+    // update the server with the merged, de-duped results at that time.  We
+    // still fix here, though, to correct problems in clients that have disabled
+    // search engine sync, since in that case that code will never be reached.
+    if (DeDupeEncodings(&i->input_encodings) && service)
+      service->UpdateKeyword(*i);
     template_urls->push_back(new TemplateURL(profile, *i));
+  }
 
   int64 default_search_provider_id = keyword_result.default_search_provider_id;
   if (default_search_provider_id) {
     *default_search_provider =
         GetTemplateURLByID(*template_urls, default_search_provider_id);
   }
 
   ScopedVector<TemplateURL> prepopulated_urls;
   size_t default_search_index;
   TemplateURLPrepopulateData::GetPrepopulatedEngines(profile,
       &prepopulated_urls.get(), &default_search_index);
   RemoveDuplicatePrepopulateIDs(service, prepopulated_urls,
                                 *default_search_provider, template_urls,
                                 removed_keyword_guids);
 
   const int resource_keyword_version =
       TemplateURLPrepopulateData::GetDataVersion(
           profile ? profile->GetPrefs() : NULL);
   if (keyword_result.builtin_keyword_version != resource_keyword_version) {
     MergeEnginesFromPrepopulateData(profile, service, &prepopulated_urls,
         default_search_index, template_urls, default_search_provider,
         removed_keyword_guids);
     *new_resource_keyword_version = resource_keyword_version;
   }
 }
 
+bool DeDupeEncodings(std::vector<std::string>* encodings) {
+  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();
+}
+
 bool DidDefaultSearchProviderChange(
     const WDTypedResult& result,
     Profile* profile,
     scoped_ptr<TemplateURL>* backup_default_search_provider) {
   DCHECK(backup_default_search_provider);
   DCHECK(!backup_default_search_provider->get());
   DCHECK_EQ(result.GetType(), KEYWORDS_RESULT);
 
   WDKeywordsResult keyword_result = reinterpret_cast<
       const WDResult<WDKeywordsResult>*>(&result)->GetValue();
 
   if (!keyword_result.did_default_search_provider_change)
     return false;
 
   if (keyword_result.backup_valid) {
     backup_default_search_provider->reset(new TemplateURL(profile,
         keyword_result.default_search_provider_backup));
   }
   return true;
 }