chrome/browser/ui/search/instant_test_utils.cc - Issue 1135163002: Omnibox - Strip Extra Whitespace from Custom Search Engine Names

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/search/instant_test_utils.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

« no previous file with comments | « chrome/browser/ui/search/instant_search_prerenderer_unittest.cc ('k') | chrome/browser/ui/search/new_tab_page_interceptor_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search/instant_test_utils.cc

diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc

index 838a9dbef80df212ab8723c9009b368453c992c4..e40f16c7e6afdff56518793cdf6d97eb7e48cb10 100644

--- a/chrome/browser/ui/search/instant_test_utils.cc

+++ b/chrome/browser/ui/search/instant_test_utils.cc

@@ -54,7 +54,7 @@ void InstantTestBase::SetupInstant(Browser* browser) {

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();

@@ -75,7 +75,7 @@ void InstantTestBase::SetInstantURL(const std::string& url) {

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;