chrome/browser/ui/search/instant_search_prerenderer_unittest.cc - Issue 176843022: Move UTF16ToASCII, remove WideToASCII.

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_search_prerenderer_unittest.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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/autofill/data_model_wrapper.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9216c4e7849c00d10e90d05513fd2842ac705d55..f4ba748015fa76cdb25fedf06b8195a799d34139 100644

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

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

@@ -237,15 +237,17 @@ TEST_F(InstantSearchPrerendererTest, GetSearchTermsFromPrerenderedPage) {

GURL url(GetPrerenderURL());

EXPECT_EQ(GURL("https://www.google.com/instant?ion=1&foo=foo#foo=foo&strk"),

url);

- EXPECT_EQ(UTF16ToASCII(prerenderer->get_last_query()),

- UTF16ToASCII(chrome::ExtractSearchTermsFromURL(profile(), url)));

+ EXPECT_EQ(base::UTF16ToASCII(prerenderer->get_last_query()),

+ base::UTF16ToASCII(

+ chrome::ExtractSearchTermsFromURL(profile(), url)));

// Assume the prerendered page prefetched search results for the query

// "flowers".

SetLastQuery(ASCIIToUTF16("flowers"));

- EXPECT_EQ("flowers", UTF16ToASCII(prerenderer->get_last_query()));

- EXPECT_EQ(UTF16ToASCII(prerenderer->get_last_query()),

- UTF16ToASCII(chrome::ExtractSearchTermsFromURL(profile(), url)));

+ EXPECT_EQ("flowers", base::UTF16ToASCII(prerenderer->get_last_query()));

+ EXPECT_EQ(base::UTF16ToASCII(prerenderer->get_last_query()),

+ base::UTF16ToASCII(

+ chrome::ExtractSearchTermsFromURL(profile(), url)));

}

TEST_F(InstantSearchPrerendererTest, PrefetchSearchResults) {

@@ -254,7 +256,7 @@ TEST_F(InstantSearchPrerendererTest, PrefetchSearchResults) {

InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();

prerenderer->Prerender(

InstantSuggestion(ASCIIToUTF16("flowers"), std::string()));

- EXPECT_EQ("flowers", UTF16ToASCII(prerenderer->get_last_query()));

+ EXPECT_EQ("flowers", base::UTF16ToASCII(prerenderer->get_last_query()));

EXPECT_TRUE(MessageWasSent(

ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));

}

@@ -266,7 +268,7 @@ TEST_F(InstantSearchPrerendererTest, DoNotPrefetchSearchResults) {

InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();

prerenderer->Prerender(

InstantSuggestion(ASCIIToUTF16("flowers"), std::string()));

- EXPECT_EQ("", UTF16ToASCII(prerenderer->get_last_query()));

+ EXPECT_EQ("", base::UTF16ToASCII(prerenderer->get_last_query()));

EXPECT_FALSE(MessageWasSent(

ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));

}