Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/ui/search/instant_test_utils.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_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 36 matching lines @@
 void InstantTestBase::SetupInstant(Browser* browser) {
   browser_ = browser;
 
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
   // Necessary to use exact URL for both the main URL and the alternate URL for
   // search term extraction to work in InstantExtended.
-  data.short_name = base::ASCIIToUTF16("name");
+  data.SetShortName(base::ASCIIToUTF16("name"));
   data.SetURL(instant_url_.spec() +
               "q={searchTerms}&is_search&{google:omniboxStartMarginParameter}");
   data.instant_url = instant_url_.spec();
   data.new_tab_url = ntp_url_.spec();
   if (init_suggestions_url_)
     data.suggestions_url = instant_url_.spec() + "#q={searchTerms}";
   data.alternate_urls.push_back(instant_url_.spec() + "#q={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
   TemplateURL* template_url = new TemplateURL(data);
   service->Add(template_url);  // Takes ownership of |template_url|.
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void InstantTestBase::SetInstantURL(const std::string& url) {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
-  data.short_name = base::ASCIIToUTF16("name");
+  data.SetShortName(base::ASCIIToUTF16("name"));
   data.SetURL(url);
   data.instant_url = url;
 
   TemplateURL* template_url = new TemplateURL(data);
   service->Add(template_url);  // Takes ownership of |template_url|.
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void InstantTestBase::Init(const GURL& instant_url,
                            const GURL& ntp_url,
@@ skipping 81 matching lines @@
   return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);
 }
 
 base::string16 InstantTestBase::GetBlueText() {
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }