Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/search_engines/default_search_pref_migration.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 "chrome/browser/search_engines/default_search_pref_migration.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
     return scoped_ptr<TemplateURLData>();
 
   base::string16 keyword =
       base::UTF8ToUTF16(prefs->GetString(prefs::kDefaultSearchProviderKeyword));
   std::string search_url =
       prefs->GetString(prefs::kDefaultSearchProviderSearchURL);
   if (keyword.empty() || search_url.empty())
     return scoped_ptr<TemplateURLData>();
 
   scoped_ptr<TemplateURLData> default_provider_data(new TemplateURLData);
-  default_provider_data->short_name =
-      base::UTF8ToUTF16(prefs->GetString(prefs::kDefaultSearchProviderName));
+  default_provider_data->SetShortName(
+      base::UTF8ToUTF16(prefs->GetString(prefs::kDefaultSearchProviderName)));
   default_provider_data->SetKeyword(keyword);
   default_provider_data->SetURL(search_url);
   default_provider_data->suggestions_url =
       prefs->GetString(prefs::kDefaultSearchProviderSuggestURL);
   default_provider_data->instant_url =
       prefs->GetString(prefs::kDefaultSearchProviderInstantURL);
   default_provider_data->image_url =
       prefs->GetString(prefs::kDefaultSearchProviderImageURL);
   default_provider_data->new_tab_url =
       prefs->GetString(prefs::kDefaultSearchProviderNewTabURL);
@@ skipping 99 matching lines @@
 void ConfigureDefaultSearchPrefMigrationToDictionaryValue(
     PrefService* pref_service) {
   if (pref_service->GetInitializationStatus() ==
       PrefService::INITIALIZATION_STATUS_WAITING) {
     pref_service->AddPrefInitObserver(
         base::Bind(&OnPrefsInitialized, base::Unretained(pref_service)));
   } else {
     MigrateDefaultSearchPref(pref_service);
   }
 }