Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/template_url.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/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1259 matching lines @@
   return url.ReplaceComponents(rep);
 }
 
 // static
 bool TemplateURL::MatchesData(const TemplateURL* t_url,
                               const TemplateURLData* data,
                               const SearchTermsData& search_terms_data) {
   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) &&
       (t_url->instant_url() == data->instant_url) &&
       (t_url->image_url() == data->image_url) &&
       (t_url->new_tab_url() == data->new_tab_url) &&
       (t_url->search_url_post_params() == data->search_url_post_params) &&
       (t_url->suggestions_url_post_params() ==
           data->suggestions_url_post_params) &&
       (t_url->instant_url_post_params() == data->instant_url_post_params) &&
       (t_url->image_url_post_params() == data->image_url_post_params) &&
       (t_url->favicon_url() == data->favicon_url) &&
       (t_url->safe_for_autoreplace() == data->safe_for_autoreplace) &&
       (t_url->show_in_default_list() == data->show_in_default_list) &&
       (t_url->input_encodings() == data->input_encodings) &&
       (t_url->alternate_urls() == data->alternate_urls) &&
       (t_url->search_terms_replacement_key() ==
           data->search_terms_replacement_key);
 }
 
 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;
 }
 
 bool TemplateURL::ShowInDefaultList(
     const SearchTermsData& search_terms_data) const {
   return data_.show_in_default_list &&
       url_ref_.SupportsReplacement(search_terms_data);
 }
 
@@ skipping 230 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }