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

Unified Diff: chrome/browser/ui/find_bar/find_bar_host_browsertest.cc

Issue 102993018: Remove UTF string conversion functions from the global namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aaaaaaaaaa Created 7 years 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/find_bar/find_bar_host_browsertest.cc
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 014a64bfbcde630da920f696d067bf1d18960cf1..6300adac608ff5b9ee3bcc3520f03bbcf42b7fbb 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -332,8 +332,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_SearchWithinSpecialURL) {
FlushHistoryService();
EXPECT_EQ(1,
FindInPageWchar(web_contents,
- ASCIIToWide(download_url.spec()).c_str(), kFwd,
- kIgnoreCase, NULL));
+ base::ASCIIToWide(download_url.spec()).c_str(),
+ kFwd, kIgnoreCase, NULL));
}
// Verify search selection coordinates. The data file used is set-up such that
@@ -416,7 +416,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindLongString) {
base::FilePath().AppendASCII("LongFind.txt"));
std::string query;
base::ReadFileToString(path, &query);
- std::wstring search_string = UTF8ToWide(query);
+ std::wstring search_string = base::UTF8ToWide(query);
EXPECT_EQ(1,
FindInPageWchar(web_contents, search_string.c_str(),
kFwd, kIgnoreCase, NULL));
@@ -479,7 +479,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindWholeFileContent) {
std::string query;
base::ReadFileToString(path, &query);
- std::wstring search_string = UTF8ToWide(query);
+ std::wstring search_string = base::UTF8ToWide(query);
EXPECT_EQ(1,
FindInPageWchar(web_contents, search_string.c_str(),
false, false, NULL));
« no previous file with comments | « chrome/browser/sync/profile_sync_service_bookmark_unittest.cc ('k') | chrome/browser/ui/views/external_protocol_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698