Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/keyword_table_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 24 matching lines @@
     db_->AddTable(table_.get());
     ASSERT_EQ(sql::INIT_OK, db_->Init(file_));
   }
 
   void AddKeyword(const TemplateURLData& keyword) const {
     EXPECT_TRUE(table_->AddKeyword(keyword));
   }
 
   TemplateURLData CreateAndAddKeyword() const {
     TemplateURLData keyword;
-    keyword.short_name = ASCIIToUTF16("short_name");
+    keyword.SetShortName(ASCIIToUTF16("short_name"));
     keyword.SetKeyword(ASCIIToUTF16("keyword"));
     keyword.SetURL("http://url/");
     keyword.suggestions_url = "url2";
     keyword.instant_url = "http://instant/";
     keyword.image_url = "http://image-search-url/";
     keyword.new_tab_url = "http://new-tab-url/";
     keyword.search_url_post_params = "ie=utf-8,oe=utf-8";
     keyword.image_url_post_params = "name=1,value=2";
     keyword.favicon_url = GURL("http://favicon.url/");
     keyword.originating_url = GURL("http://google.com/");
@@ skipping 54 matching lines @@
 };
 
 
 TEST_F(KeywordTableTest, Keywords) {
   TemplateURLData keyword(CreateAndAddKeyword());
 
   KeywordTable::Keywords keywords(GetKeywords());
   EXPECT_EQ(1U, keywords.size());
   const TemplateURLData& restored_keyword = keywords.front();
 
-  EXPECT_EQ(keyword.short_name, restored_keyword.short_name);
+  EXPECT_EQ(keyword.short_name(), restored_keyword.short_name());
   EXPECT_EQ(keyword.keyword(), restored_keyword.keyword());
   EXPECT_EQ(keyword.url(), restored_keyword.url());
   EXPECT_EQ(keyword.suggestions_url, restored_keyword.suggestions_url);
   EXPECT_EQ(keyword.instant_url, restored_keyword.instant_url);
   EXPECT_EQ(keyword.favicon_url, restored_keyword.favicon_url);
   EXPECT_EQ(keyword.originating_url, restored_keyword.originating_url);
   EXPECT_EQ(keyword.show_in_default_list,
             restored_keyword.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace,
             restored_keyword.safe_for_autoreplace);
@@ skipping 24 matching lines @@
   keyword.instant_url = "http://instant2/";
   keyword.originating_url = GURL("http://originating.url/");
   keyword.input_encodings.push_back("Shift_JIS");
   keyword.prepopulate_id = 5;
   UpdateKeyword(keyword);
 
   KeywordTable::Keywords keywords(GetKeywords());
   EXPECT_EQ(1U, keywords.size());
   const TemplateURLData& restored_keyword = keywords.front();
 
-  EXPECT_EQ(keyword.short_name, restored_keyword.short_name);
+  EXPECT_EQ(keyword.short_name(), restored_keyword.short_name());
   EXPECT_EQ(keyword.keyword(), restored_keyword.keyword());
   EXPECT_EQ(keyword.suggestions_url, restored_keyword.suggestions_url);
   EXPECT_EQ(keyword.instant_url, restored_keyword.instant_url);
   EXPECT_EQ(keyword.favicon_url, restored_keyword.favicon_url);
   EXPECT_EQ(keyword.originating_url, restored_keyword.originating_url);
   EXPECT_EQ(keyword.show_in_default_list,
             restored_keyword.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace,
             restored_keyword.safe_for_autoreplace);
   EXPECT_EQ(keyword.input_encodings, restored_keyword.input_encodings);
   EXPECT_EQ(keyword.id, restored_keyword.id);
   EXPECT_EQ(keyword.prepopulate_id, restored_keyword.prepopulate_id);
 }
 
 TEST_F(KeywordTableTest, KeywordWithNoFavicon) {
   TemplateURLData keyword;
-  keyword.short_name = ASCIIToUTF16("short_name");
+  keyword.SetShortName(ASCIIToUTF16("short_name"));
   keyword.SetKeyword(ASCIIToUTF16("keyword"));
   keyword.SetURL("http://url/");
   keyword.safe_for_autoreplace = true;
   keyword.id = -100;
   AddKeyword(keyword);
 
   KeywordTable::Keywords keywords(GetKeywords());
   EXPECT_EQ(1U, keywords.size());
   const TemplateURLData& restored_keyword = keywords.front();
 
-  EXPECT_EQ(keyword.short_name, restored_keyword.short_name);
+  EXPECT_EQ(keyword.short_name(), restored_keyword.short_name());
   EXPECT_EQ(keyword.keyword(), restored_keyword.keyword());
   EXPECT_EQ(keyword.favicon_url, restored_keyword.favicon_url);
   EXPECT_EQ(keyword.safe_for_autoreplace,
             restored_keyword.safe_for_autoreplace);
   EXPECT_EQ(keyword.id, restored_keyword.id);
 }
 
 TEST_F(KeywordTableTest, SanitizeURLs) {
   TemplateURLData keyword;
-  keyword.short_name = ASCIIToUTF16("legit");
+  keyword.SetShortName(ASCIIToUTF16("legit"));
   keyword.SetKeyword(ASCIIToUTF16("legit"));
   keyword.SetURL("http://url/");
   keyword.id = 1000;
   AddKeyword(keyword);
 
-  keyword.short_name = ASCIIToUTF16("bogus");
+  keyword.SetShortName(ASCIIToUTF16("bogus"));
   keyword.SetKeyword(ASCIIToUTF16("bogus"));
   keyword.id = 2000;
   AddKeyword(keyword);
 
   EXPECT_EQ(2U, GetKeywords().size());
 
   // Erase the URL field for the second keyword to simulate having bogus data
   // previously saved into the database.
   sql::Statement s;
   GetStatement("UPDATE keywords SET url=? WHERE id=?", &s);
   s.BindString16(0, base::string16());
   s.BindInt64(1, 2000);
   EXPECT_TRUE(s.Run());
 
   // GetKeywords() should erase the entry with the empty URL field.
   EXPECT_EQ(1U, GetKeywords().size());
 }
+
+TEST_F(KeywordTableTest, SanitizeShortName) {
+  TemplateURLData keyword;
+  {
+    keyword.SetShortName(ASCIIToUTF16("legit name"));
+    keyword.SetKeyword(ASCIIToUTF16("legit"));
+    keyword.SetURL("http://url/");
+    keyword.id = 1000;
+    AddKeyword(keyword);
+    KeywordTable::Keywords keywords(GetKeywords());
+    EXPECT_EQ(1U, keywords.size());
+    const TemplateURLData& keyword_from_database = keywords.front();
+    EXPECT_EQ(keyword.id, keyword_from_database.id);
+    EXPECT_EQ(ASCIIToUTF16("legit name"), keyword_from_database.short_name());
+    RemoveKeyword(keyword.id);
+  }
+
+  {
+    keyword.SetShortName(ASCIIToUTF16("\t\tbogus \tname \n"));
+    keyword.SetKeyword(ASCIIToUTF16("bogus"));
+    keyword.id = 2000;
+    AddKeyword(keyword);
+    KeywordTable::Keywords keywords(GetKeywords());
+    EXPECT_EQ(1U, keywords.size());
+    const TemplateURLData& keyword_from_database = keywords.front();
+    EXPECT_EQ(keyword.id, keyword_from_database.id);
+    EXPECT_EQ(ASCIIToUTF16("bogus name"), keyword_from_database.short_name());
+    RemoveKeyword(keyword.id);
+  }
+}