Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/search_engines/search_provider_install_data_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 156 matching lines @@
   // It doesn't matter that this happens after install_data_ is deleted.
   process_.reset();
 
   testing::Test::TearDown();
 }
 
 TemplateURL* SearchProviderInstallDataTest::AddNewTemplateURL(
     const std::string& url,
     const base::string16& keyword) {
   TemplateURLData data;
-  data.short_name = keyword;
+  data.SetShortName(keyword);
   data.SetKeyword(keyword);
   data.SetURL(url);
   TemplateURL* t_url = new TemplateURL(data);
   util_.model()->Add(t_url);
   return t_url;
 }
 
 void SearchProviderInstallDataTest::SetGoogleBaseURLAndProcessOnIOThread(
     GURL base_url) {
   util_.SetGoogleBaseURL(base_url);
@@ skipping 82 matching lines @@
   // Verify the search providers install state (with no default set).
   test_get_install_state.RunTests(google_host, std::string());
 
   // Change the Google base url.
   google_host = "foo.com";
   SetGoogleBaseURLAndProcessOnIOThread(GURL("http://" + google_host + "/"));
 
   // Verify that the change got picked up.
   test_get_install_state.RunTests(google_host, std::string());
 }