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

Unified Diff: chrome/browser/automation/testing_automation_provider.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
« no previous file with comments | « base/test/test_file_util_posix.cc ('k') | chrome/browser/importer/firefox_importer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index d65f737e6fe114062db3e47b6c1b461b7aa009f1..42a4b1e346575c1105d99a7dcaac329ffc443dbe 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -972,7 +972,7 @@ void TestingAutomationProvider::GetTabTitle(int handle,
NavigationController* tab = tab_tracker_->GetResource(handle);
NavigationEntry* entry = tab->GetActiveEntry();
if (entry != NULL) {
- *title = UTF16ToWideHack(entry->GetTitleForDisplay(std::string()));
+ *title = base::UTF16ToWideHack(entry->GetTitleForDisplay(std::string()));
} else {
*title = std::wstring();
}
@@ -1033,8 +1033,9 @@ void TestingAutomationProvider::ExecuteJavascript(
}
new DomOperationMessageSender(this, reply_message, false);
- ExecuteJavascriptInRenderViewFrame(WideToUTF16Hack(frame_xpath),
- WideToUTF16Hack(script), reply_message,
+ ExecuteJavascriptInRenderViewFrame(base::WideToUTF16Hack(frame_xpath),
+ base::WideToUTF16Hack(script),
+ reply_message,
web_contents->GetRenderViewHost());
}
« no previous file with comments | « base/test/test_file_util_posix.cc ('k') | chrome/browser/importer/firefox_importer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698