Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/template_url_parser.cc

Index: components/search_engines/template_url_parser.cc
diff --git a/components/search_engines/template_url_parser.cc b/components/search_engines/template_url_parser.cc
index 14298da11b6b5381db9598403584cf259bf2b487..edcc1dcbed3100609b0697fea84bd51df3916190 100644
--- a/components/search_engines/template_url_parser.cc
+++ b/components/search_engines/template_url_parser.cc
@@ -251,7 +251,7 @@ void TemplateURLParsingContext::EndElementImpl(void* ctx, const xmlChar* name) {
       context->ProcessURLParams();
       break;
     case TemplateURLParsingContext::SHORT_NAME:
-      context->data_.short_name = context->string_;
+      context->data_.SetShortName(context->string_);
       break;
     case TemplateURLParsingContext::IMAGE: {
       GURL image_url(base::UTF16ToUTF8(context->string_));
@@ -299,8 +299,9 @@ TemplateURL* TemplateURLParsingContext::GetTemplateURL(
     const SearchTermsData& search_terms_data,
     bool show_in_default_list) {
   // TODO(jcampan): Support engines that use POST; see http://crbug.com/18107
-  if (method_ == TemplateURLParsingContext::POST || data_.short_name.empty() ||
-      !IsHTTPRef(data_.url()) || !IsHTTPRef(data_.suggestions_url))
+  if (method_ == TemplateURLParsingContext::POST ||
+      data_.short_name().empty() || !IsHTTPRef(data_.url()) ||
+      !IsHTTPRef(data_.suggestions_url))
     return NULL;
   if (suggestion_method_ == TemplateURLParsingContext::POST)
     data_.suggestions_url.clear();