Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1774)

Unified Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 1135163002: Omnibox - Strip Extra Whitespace from Custom Search Engine Names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more tests that don't set short_name Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 8c02bb4c5b2ca40b9edfa7c457fd59f505023c9e..77447704611840c2bad82eb7c8a1c2ec51cb22c6 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -267,7 +267,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
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);
@@ -630,7 +630,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLDWithTemporaryText) {
// 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));
@@ -1077,7 +1077,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) {
// 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);
@@ -1102,7 +1102,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) {
// 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));

Powered by Google App Engine
This is Rietveld 408576698