Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/search_engines/default_search_pref_migration_unittest.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 "chrome/browser/search_engines/default_search_pref_migration.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 121 matching lines @@
   prefs->Set(prefs::kDefaultSearchProviderAlternateURLs, alternate_urls);
   prefs->SetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey,
       search_terms_replacement_key);
 }
 
 scoped_ptr<TemplateURL> DefaultSearchPrefMigrationTest::CreateKeyword(
     const std::string& short_name,
     const std::string& keyword,
     const std::string& url) {
   TemplateURLData data;
-  data.short_name = base::ASCIIToUTF16(short_name);
+  data.SetShortName(base::ASCIIToUTF16(short_name));
   data.SetKeyword(base::ASCIIToUTF16(keyword));
   data.SetURL(url);
   scoped_ptr<TemplateURL> t_url(new TemplateURL(data));
   return t_url.Pass();
 }
 
 TEST_F(DefaultSearchPrefMigrationTest, MigrateUserSelectedValue) {
   scoped_ptr<TemplateURL> t_url(
       CreateKeyword("name1", "key1", "http://foo1/{searchTerms}"));
   // Store a value in the legacy location.
   SaveDefaultSearchProviderToLegacyPrefs(t_url.get());
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(profile()->GetPrefs());
 
   // Test that it was migrated.
   DefaultSearchManager::Source source;
   const TemplateURLData* modern_default =
       default_search_manager()->GetDefaultSearchEngine(&source);
   ASSERT_TRUE(modern_default);
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
-  EXPECT_EQ(t_url->short_name(), modern_default->short_name);
+  EXPECT_EQ(t_url->short_name(), modern_default->short_name());
   EXPECT_EQ(t_url->keyword(), modern_default->keyword());
   EXPECT_EQ(t_url->url(), modern_default->url());
 }
 
 TEST_F(DefaultSearchPrefMigrationTest, MigrateOnlyOnce) {
   scoped_ptr<TemplateURL> t_url(
       CreateKeyword("name1", "key1", "http://foo1/{searchTerms}"));
   // Store a value in the legacy location.
   SaveDefaultSearchProviderToLegacyPrefs(t_url.get());
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(profile()->GetPrefs());
 
   // Test that it was migrated.
   DefaultSearchManager::Source source;
   const TemplateURLData* modern_default =
       default_search_manager()->GetDefaultSearchEngine(&source);
   ASSERT_TRUE(modern_default);
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
-  EXPECT_EQ(t_url->short_name(), modern_default->short_name);
+  EXPECT_EQ(t_url->short_name(), modern_default->short_name());
   EXPECT_EQ(t_url->keyword(), modern_default->keyword());
   EXPECT_EQ(t_url->url(), modern_default->url());
   default_search_manager()->ClearUserSelectedDefaultSearchEngine();
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(profile()->GetPrefs());
 
   // Test that it was NOT migrated.
   modern_default = default_search_manager()->GetDefaultSearchEngine(&source);
   ASSERT_TRUE(modern_default);
@@ skipping 13 matching lines @@
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(profile()->GetPrefs());
 
   // Test that no migration occurred. The modern value is left intact.
   DefaultSearchManager::Source source;
   const TemplateURLData* modern_default =
       default_search_manager()->GetDefaultSearchEngine(&source);
   ASSERT_TRUE(modern_default);
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
-  EXPECT_EQ(t_url2->short_name(), modern_default->short_name);
+  EXPECT_EQ(t_url2->short_name(), modern_default->short_name());
   EXPECT_EQ(t_url2->keyword(), modern_default->keyword());
   EXPECT_EQ(t_url2->url(), modern_default->url());
 }
 
 TEST_F(DefaultSearchPrefMigrationTest,
        AutomaticallySelectedValueIsNotMigrated) {
   DefaultSearchManager::Source source;
   TemplateURLData prepopulated_default(
       *default_search_manager()->GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 
   TemplateURL prepopulated_turl(prepopulated_default);
 
   // Store a value in the legacy location.
   SaveDefaultSearchProviderToLegacyPrefs(&prepopulated_turl);
 
   // Run the migration.
   ConfigureDefaultSearchPrefMigrationToDictionaryValue(profile()->GetPrefs());
 
   // Test that the legacy value is not migrated, as it is not user-selected.
   default_search_manager()->GetDefaultSearchEngine(&source);
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 }