Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/omnibox/autocomplete_result_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 "components/omnibox/autocomplete_result.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 382 matching lines @@
   EXPECT_EQ(1200, result.match_at(1)->relevance);
   EXPECT_TRUE(result.match_at(2)->destination_url.is_empty());
   EXPECT_EQ(1100, result.match_at(2)->relevance);
   EXPECT_EQ("http://b/", result.match_at(3)->destination_url.spec());
   EXPECT_EQ(1000, result.match_at(3)->relevance);
 }
 
 TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {
   // Register a template URL that corresponds to 'foo' search engine.
   TemplateURLData url_data;
-  url_data.short_name = base::ASCIIToUTF16("unittest");
+  url_data.SetShortName(base::ASCIIToUTF16("unittest"));
   url_data.SetKeyword(base::ASCIIToUTF16("foo"));
   url_data.SetURL("http://www.foo.com/s?q={searchTerms}");
   template_url_service_.get()->Add(new TemplateURL(url_data));
 
   TestData data[] = {
     { 0, 1, 1300, true },
     { 1, 1, 1200, true },
     { 2, 1, 1100, true },
     { 3, 1, 1000, true },
     { 4, 2, 900,  true },
@@ skipping 25 matching lines @@
             result.match_at(1)->destination_url.spec());
   EXPECT_EQ(1200, result.match_at(1)->relevance);
   EXPECT_EQ("http://www.foo.com/",
             result.match_at(2)->destination_url.spec());
   EXPECT_EQ(900, result.match_at(2)->relevance);
 }
 
 TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) {
   // Register a template URL that corresponds to 'foo' search engine.
   TemplateURLData url_data;
-  url_data.short_name = base::ASCIIToUTF16("unittest");
+  url_data.SetShortName(base::ASCIIToUTF16("unittest"));
   url_data.SetKeyword(base::ASCIIToUTF16("foo"));
   url_data.SetURL("http://www.foo.com/s?q={searchTerms}");
   template_url_service_.get()->Add(new TemplateURL(url_data));
 
   AutocompleteMatch dup_match;
   dup_match.destination_url = GURL("http://www.foo.com/s?q=foo&oq=dup");
   std::vector<AutocompleteMatch> dups;
   dups.push_back(dup_match);
 
   TestData data[] = {
@@ skipping 291 matching lines @@
   result.Reset();
   matches.clear();
 
   // Case 5: Multiple verbatim matches found in AutocompleteResult.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
   result.AppendMatches(matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }