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

Unified Diff: chrome/browser/instant/instant_browsertest.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/importer/importer_unittest_utils.cc ('k') | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_browsertest.cc
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index d5cb8c84ee71541c3a180afc5db4bc4e17964a0f..974e05d7b3f6d3f682e345ab0463cc1eb27b5b50 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -812,23 +812,23 @@ IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreCaseInsensitive) {
omnibox()->RevertAll();
SetOmniboxTextAndWaitForInstantToShow("i");
- EXPECT_EQ(WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
+ EXPECT_EQ(base::WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
omnibox()->RevertAll();
SetOmniboxTextAndWaitForInstantToShow("I");
- EXPECT_EQ(WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
+ EXPECT_EQ(base::WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
omnibox()->RevertAll();
- SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"i\u0307"));
- EXPECT_EQ(WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
+ SetOmniboxTextAndWaitForInstantToShow(base::WideToUTF8(L"i\u0307"));
+ EXPECT_EQ(base::WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
omnibox()->RevertAll();
- SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"I\u0307"));
- EXPECT_EQ(WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
+ SetOmniboxTextAndWaitForInstantToShow(base::WideToUTF8(L"I\u0307"));
+ EXPECT_EQ(base::WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
omnibox()->RevertAll();
- SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"\u0130"));
- EXPECT_EQ(WideToUTF16(L"\u0130NSTANT"), omnibox()->GetText());
+ SetOmniboxTextAndWaitForInstantToShow(base::WideToUTF8(L"\u0130"));
+ EXPECT_EQ(base::WideToUTF16(L"\u0130NSTANT"), omnibox()->GetText());
omnibox()->RevertAll();
SetOmniboxTextAndWaitForInstantToShow("in");
@@ -845,8 +845,8 @@ IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreCaseInsensitive) {
EXPECT_TRUE(ExecuteScript("suggestion = [ { value: '\\u1e0d\\u0307oh' } ]"));
omnibox()->RevertAll();
- SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"\u1e0b\u0323"));
- EXPECT_EQ(WideToUTF16(L"\u1e0b\u0323oh"), omnibox()->GetText());
+ SetOmniboxTextAndWaitForInstantToShow(base::WideToUTF8(L"\u1e0b\u0323"));
+ EXPECT_EQ(base::WideToUTF16(L"\u1e0b\u0323oh"), omnibox()->GetText());
}
// Flakes on Windows and Mac: http://crbug.com/170677
« no previous file with comments | « chrome/browser/importer/importer_unittest_utils.cc ('k') | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698