Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // Copyright 2013 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/ui/search/instant_search_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 302 matching lines @@
   // Allow prerendering only for search type AutocompleteMatch suggestions.
   AutocompleteMatch search_type_match(NULL, 1100, false,
                                       AutocompleteMatchType::SEARCH_SUGGEST);
   search_type_match.keyword = ASCIIToUTF16("{google:baseurl}");
   EXPECT_TRUE(AutocompleteMatch::IsSearchType(search_type_match.type));
   EXPECT_TRUE(prerenderer->IsAllowed(search_type_match, active_tab));
 
   // Do not allow prerendering for custom search provider requests.
   TemplateURLData data;
   data.SetURL("https://www.dummyurl.com/search?q=%s&img=1");
-  data.short_name = ASCIIToUTF16("t");
+  data.SetShortName(ASCIIToUTF16("t"));
   data.SetKeyword(ASCIIToUTF16("k"));
   TemplateURL* t_url = new TemplateURL(data);
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(profile());
   service->Add(t_url);
   service->Load();
   AutocompleteMatch custom_search_type_match(
       NULL, 1100, false, AutocompleteMatchType::SEARCH_SUGGEST);
   custom_search_type_match.keyword = ASCIIToUTF16("k");
   custom_search_type_match.destination_url =
@@ skipping 198 matching lines @@
   Tuple<base::string16, EmbeddedSearchRequestParams> params;
   ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
   EXPECT_EQ("foo", base::UTF16ToASCII(get<0>(params)));
   EXPECT_EQ("f", base::UTF16ToASCII(get<1>(params).original_query));
   EXPECT_EQ("utf-8", base::UTF16ToASCII(get<1>(params).input_encoding));
   EXPECT_EQ("", base::UTF16ToASCII(get<1>(params).rlz_parameter_value));
   EXPECT_EQ("chrome...0",
             base::UTF16ToASCII(get<1>(params).assisted_query_stats));
 }
 #endif