Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stdio.h>
 
 #include "base/command_line.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 249 matching lines @@
     Profile* profile = browser()->profile();
     TemplateURLService* model =
         TemplateURLServiceFactory::GetForProfile(profile);
     ASSERT_TRUE(model);
 
     ui_test_utils::WaitForTemplateURLServiceToLoad(model);
 
     ASSERT_TRUE(model->loaded());
 
     TemplateURLData data;
-    data.short_name = ASCIIToUTF16(kSearchShortName);
+    data.SetShortName(ASCIIToUTF16(kSearchShortName));
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword));
     data.SetURL(kSearchURL);
     TemplateURL* template_url = new TemplateURL(data);
     model->Add(template_url);
     model->SetUserSelectedDefaultSearchProvider(template_url);
 
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword2));
     model->Add(new TemplateURL(data));
 
     // Remove built-in template urls, like google.com, bing.com etc., as they
@@ skipping 342 matching lines @@
   ASSERT_TRUE(popup_model);
 
   Profile* profile = browser()->profile();
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
 
   // Add a non-substituting keyword. This ensures the popup will have a
   // non-verbatim entry with "ab" as a prefix. This way, by arrowing down, we
   // can set "abc" as temporary text in the omnibox.
   TemplateURLData data;
-  data.short_name = ASCIIToUTF16("abc");
+  data.SetShortName(ASCIIToUTF16("abc"));
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/");
   template_url_service->Add(new TemplateURL(data));
 
   // Send "ab", so that an "abc" entry appears in the popup.
   const ui::KeyboardCode kSearchTextPrefixKeys[] = {
     ui::VKEY_A, ui::VKEY_B, ui::VKEY_UNKNOWN
   };
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextPrefixKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
@@ skipping 426 matching lines @@
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
   ASSERT_TRUE(popup_model);
 
   Profile* profile = browser()->profile();
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
 
   // Add a non-default substituting keyword.
   TemplateURLData data;
-  data.short_name = ASCIIToUTF16("Search abc");
+  data.SetShortName(ASCIIToUTF16("Search abc"));
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/{searchTerms}");
   TemplateURL* template_url = new TemplateURL(data);
   template_url_service->Add(template_url);
 
   omnibox_view->SetUserText(base::string16());
 
   // Non-default substituting keyword shouldn't be matched by default.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Check if the default match result is Search Primary Provider.
   ASSERT_EQ(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
             popup_model->result().default_match()->type);
   ASSERT_EQ(kSearchTextURL,
             popup_model->result().default_match()->destination_url.spec());
 
   omnibox_view->SetUserText(base::string16());
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_FALSE(popup_model->IsOpen());
 
   // Try a non-substituting keyword.
   template_url_service->Remove(template_url);
-  data.short_name = ASCIIToUTF16("abc");
+  data.SetShortName(ASCIIToUTF16("abc"));
   data.SetURL("http://abc.com/");
   template_url_service->Add(new TemplateURL(data));
 
   // We always allow exact matches for non-substituting keywords.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
   ASSERT_EQ(AutocompleteMatchType::HISTORY_KEYWORD,
             popup_model->result().default_match()->type);
   ASSERT_EQ("http://abc.com/",
@@ skipping 743 matching lines @@
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   test_toolbar_model->set_text(url_b);
   omnibox_view->Update();
   EXPECT_EQ(url_a, omnibox_view->GetText());
   omnibox_view->RevertAll();
   EXPECT_EQ(url_b, omnibox_view->GetText());
   test_toolbar_model->set_text(url_c);
   omnibox_view->Update();
   EXPECT_EQ(url_c, omnibox_view->GetText());
 }