Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/omnibox/keyword_provider_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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_scheme_classifier.h"
@@ skipping 251 matching lines @@
         { ASCIIToUTF16("Search ab for 1 2+ 3"), false },
         { ASCIIToUTF16("Search aaaa for 1 2+ 3"), false } } },
   };
 
   RunTest<base::string16>(contents_cases, arraysize(contents_cases),
                     &AutocompleteMatch::contents);
 }
 
 TEST_F(KeywordProviderTest, AddKeyword) {
   TemplateURLData data;
-  data.short_name = ASCIIToUTF16("Test");
+  data.SetShortName(ASCIIToUTF16("Test"));
   base::string16 keyword(ASCIIToUTF16("foo"));
   data.SetKeyword(keyword);
   data.SetURL("http://www.google.com/foo?q={searchTerms}");
   TemplateURL* template_url = new TemplateURL(data);
   model_->Add(template_url);
   ASSERT_TRUE(template_url == model_->GetTemplateURLForKeyword(keyword));
 }
 
 TEST_F(KeywordProviderTest, RemoveKeyword) {
   base::string16 url(ASCIIToUTF16("http://aaaa/?aaaa=1&b={searchTerms}&c"));
@@ skipping 86 matching lines @@
 }
 
 TEST_F(KeywordProviderTest, DoesNotProvideMatchesOnFocus) {
   AutocompleteInput input(ASCIIToUTF16("aaa"), base::string16::npos,
                           std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, true,
                           false, true, true, TestingSchemeClassifier());
   kw_provider_->Start(input, false, true);
   ASSERT_TRUE(kw_provider_->matches().empty());
 }