Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/util.cc

 // 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.
 
 #include "components/search_engines/util.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 151 matching lines @@
   }
   return NULL;
 }
 
 void MergeIntoPrepopulatedEngineData(const TemplateURL* original_turl,
                                      TemplateURLData* prepopulated_url) {
   DCHECK_EQ(original_turl->prepopulate_id(), prepopulated_url->prepopulate_id);
   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->SetShortName(original_turl->short_name());
   }
   prepopulated_url->id = original_turl->id();
   prepopulated_url->sync_guid = original_turl->sync_guid();
   prepopulated_url->date_created = original_turl->date_created();
   prepopulated_url->last_modified = original_turl->last_modified();
 }
 
 ActionsFromPrepopulateData::ActionsFromPrepopulateData() {}
 
 ActionsFromPrepopulateData::~ActionsFromPrepopulateData() {}
@@ skipping 197 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();
 }