Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/default_search_manager.cc

Index: components/search_engines/default_search_manager.cc
diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
index c71ffadf18252d8c250055cf15b0f1c23af8c0e3..21731232ebfb53317200bcd3edb8482220b36476 100644
--- a/components/search_engines/default_search_manager.cc
+++ b/components/search_engines/default_search_manager.cc
@@ -157,7 +157,7 @@ void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
 
   base::DictionaryValue url_dict;
   url_dict.SetString(kID, base::Int64ToString(data.id));
-  url_dict.SetString(kShortName, data.short_name);
+  url_dict.SetString(kShortName, data.short_name());
   url_dict.SetString(kKeyword, data.keyword());
   url_dict.SetInteger(kPrepopulateID, data.prepopulate_id);
   url_dict.SetString(kSyncGUID, data.sync_guid);
@@ -268,7 +268,7 @@ void DefaultSearchManager::MergePrefsDataWithPrepopulated() {
       if (!prefs_default_search_->safe_for_autoreplace) {
         prepopulated_urls[i]->safe_for_autoreplace = false;
         prepopulated_urls[i]->SetKeyword(prefs_default_search_->keyword());
-        prepopulated_urls[i]->short_name = prefs_default_search_->short_name;
+        prepopulated_urls[i]->SetShortName(prefs_default_search_->short_name());
       }
       prepopulated_urls[i]->id = prefs_default_search_->id;
       prepopulated_urls[i]->sync_guid = prefs_default_search_->sync_guid;
@@ -318,7 +318,9 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
   std::string id;
   url_dict->GetString(kID, &id);
   base::StringToInt64(id, &prefs_default_search_->id);
-  url_dict->GetString(kShortName, &prefs_default_search_->short_name);
+  base::string16 short_name;
+  url_dict->GetString(kShortName, &short_name);
+  prefs_default_search_->SetShortName(short_name);
   url_dict->GetInteger(kPrepopulateID, &prefs_default_search_->prepopulate_id);
   url_dict->GetString(kSyncGUID, &prefs_default_search_->sync_guid);