Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/default_search_manager.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/default_search_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 139 matching lines @@
     const TemplateURLData& data) {
   if (!pref_service_) {
     prefs_default_search_.reset(new TemplateURLData(data));
     MergePrefsDataWithPrepopulated();
     NotifyObserver();
     return;
   }
 
   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);
 
   url_dict.SetString(kURL, data.url());
   url_dict.SetString(kSuggestionsURL, data.suggestions_url);
   url_dict.SetString(kInstantURL, data.instant_url);
   url_dict.SetString(kImageURL, data.image_url);
   url_dict.SetString(kNewTabURL, data.new_tab_url);
   url_dict.SetString(kFaviconURL, data.favicon_url.spec());
@@ skipping 90 matching lines @@
   ScopedVector<TemplateURLData> prepopulated_urls =
       TemplateURLPrepopulateData::GetPrepopulatedEngines(pref_service_,
                                                          &default_search_index);
 
   for (size_t i = 0; i < prepopulated_urls.size(); ++i) {
     if (prepopulated_urls[i]->prepopulate_id ==
         prefs_default_search_->prepopulate_id) {
       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;
       prepopulated_urls[i]->date_created = prefs_default_search_->date_created;
       prepopulated_urls[i]->last_modified =
           prefs_default_search_->last_modified;
       prefs_default_search_.reset(prepopulated_urls[i]);
       prepopulated_urls.weak_erase(prepopulated_urls.begin() + i);
       return;
     }
@@ skipping 29 matching lines @@
   if (search_url.empty() || keyword.empty())
     return;
 
   prefs_default_search_.reset(new TemplateURLData);
   prefs_default_search_->SetKeyword(keyword);
   prefs_default_search_->SetURL(search_url);
 
   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);
 
   url_dict->GetString(kSuggestionsURL, &prefs_default_search_->suggestions_url);
   url_dict->GetString(kInstantURL, &prefs_default_search_->instant_url);
   url_dict->GetString(kImageURL, &prefs_default_search_->image_url);
   url_dict->GetString(kNewTabURL, &prefs_default_search_->new_tab_url);
 
   std::string favicon_url;
   std::string originating_url;
@@ skipping 72 matching lines @@
   MergePrefsDataWithPrepopulated();
 }
 
 void DefaultSearchManager::NotifyObserver() {
   if (!change_observer_.is_null()) {
     Source source = FROM_FALLBACK;
     TemplateURLData* data = GetDefaultSearchEngine(&source);
     change_observer_.Run(data, source);
   }
 }