Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 8c565f285cfd548bb472decb5b8c79d4a82efa05..c5af222b371855d692086463ce148094c52d3180 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -1277,7 +1277,7 @@ bool TemplateURL::MatchesData(const TemplateURL* t_url,
   if (!t_url || !data)
     return !t_url && !data;
 
-  return (t_url->short_name() == data->short_name) &&
+  return (t_url->short_name() == data->short_name()) &&
       t_url->HasSameKeywordAs(*data, search_terms_data) &&
       (t_url->url() == data->url()) &&
       (t_url->suggestions_url() == data->suggestions_url) &&
@@ -1299,7 +1299,7 @@ bool TemplateURL::MatchesData(const TemplateURL* t_url,
 }
 
 base::string16 TemplateURL::AdjustedShortNameForLocaleDirection() const {
-  base::string16 bidi_safe_short_name = data_.short_name;
+  base::string16 bidi_safe_short_name = data_.short_name();
   base::i18n::AdjustStringForLocaleDirection(&bidi_safe_short_name);
   return bidi_safe_short_name;
 }