Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/keyword_table.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/keyword_table.h"
 
 #include <set>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 85 matching lines @@
   // TODO(beaudoin): Check what it would take to use a new table to store
   // alternate_urls while keeping backups and table signature in a good state.
   // See: crbug.com/153520
   base::ListValue alternate_urls_value;
   for (size_t i = 0; i < data.alternate_urls.size(); ++i)
     alternate_urls_value.AppendString(data.alternate_urls[i]);
   std::string alternate_urls;
   base::JSONWriter::Write(&alternate_urls_value, &alternate_urls);
 
   s->BindInt64(id_column, data.id);
-  s->BindString16(starting_column, data.short_name);
+  s->BindString16(starting_column, data.short_name());
   s->BindString16(starting_column + 1, data.keyword());
   s->BindString(starting_column + 2, data.favicon_url.is_valid() ?
       history::URLDatabase::GURLToDatabaseURL(data.favicon_url) :
       std::string());
   s->BindString(starting_column + 3, data.url());
   s->BindBool(starting_column + 4, data.safe_for_autoreplace);
   s->BindString(starting_column + 5, data.originating_url.is_valid() ?
       history::URLDatabase::GURLToDatabaseURL(data.originating_url) :
       std::string());
   s->BindInt64(starting_column + 6, data.date_created.ToTimeT());
@@ skipping 167 matching lines @@
 bool KeywordTable::MigrateToVersion59RemoveExtensionKeywords() {
   return db_->Execute("DELETE FROM keywords "
                       "WHERE url LIKE 'chrome-extension://%'");
 }
 
 // static
 bool KeywordTable::GetKeywordDataFromStatement(const sql::Statement& s,
                                                TemplateURLData* data) {
   DCHECK(data);
 
-  data->short_name = s.ColumnString16(1);
+  data->SetShortName(s.ColumnString16(1));
   data->SetKeyword(s.ColumnString16(2));
   // Due to past bugs, we might have persisted entries with empty URLs.  Avoid
   // reading these out.  (GetKeywords() will delete these entries on return.)
   // NOTE: This code should only be needed as long as we might be reading such
   // potentially-old data and can be removed afterward.
   if (s.ColumnString(4).empty())
     return false;
   data->SetURL(s.ColumnString(4));
   data->suggestions_url = s.ColumnString(11);
   data->instant_url = s.ColumnString(14);
@@ skipping 168 matching lines @@
     }
   }
 
   // Replace the old table with the new one.
   sql = "DROP TABLE " + name;
   if (!db_->Execute(sql.c_str()))
     return false;
   sql = "ALTER TABLE keywords_temp RENAME TO " + name;
   return db_->Execute(sql.c_str());
 }