Omnibox - Strip Extra Whitespace from Custom Search Engine Names

components/search_engines/template_url_fetcher_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 "base/callback_helpers.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 262 matching lines @@
             last_callback_template_url()->url_ref().DisplayURL(
                 test_util()->model()->search_terms_data()));
   EXPECT_EQ(ASCIIToUTF16("example.com"),
             last_callback_template_url()->keyword());
   EXPECT_FALSE(last_callback_template_url()->safe_for_autoreplace());
 }
 
 TEST_F(TemplateURLFetcherTest, DuplicateKeywordsTest) {
   base::string16 keyword(ASCIIToUTF16("test"));
   TemplateURLData data;
-  data.short_name = keyword;
+  data.SetShortName(keyword);
   data.SetKeyword(keyword);
   data.SetURL("http://example.com/");
   test_util()->model()->Add(new TemplateURL(data));
   test_util()->ChangeModelToLoadState();
 
   ASSERT_TRUE(test_util()->model()->GetTemplateURLForKeyword(keyword));
 
   // This should bail because the keyword already exists.
   std::string osdd_file_name("simple_open_search.xml");
   StartDownload(keyword, osdd_file_name,
@@ skipping 15 matching lines @@
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::EXPLICIT_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called());
   ASSERT_EQ(1, callbacks_destroyed());
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, add_provider_called());
   ASSERT_EQ(2, callbacks_destroyed());
   ASSERT_TRUE(last_callback_template_url());
 }