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

Unified Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « chrome_frame/test/chrome_frame_automation_mock.h ('k') | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_test_utils.cc
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index df912de2984940c8117fec3f61406aa3298c6e6d..ec589a620456975491f5ef2b232754101dad4ca7 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -512,27 +512,27 @@ base::FilePath GetSeleniumTestFolder() {
}
std::wstring GetPathFromUrl(const std::wstring& url) {
- base::string16 url16 = WideToUTF16(url);
+ base::string16 url16 = base::WideToUTF16(url);
GURL gurl = GURL(url16);
if (gurl.has_query()) {
GURL::Replacements replacements;
replacements.ClearQuery();
gurl = gurl.ReplaceComponents(replacements);
}
- return UTF8ToWide(gurl.PathForRequest());
+ return base::UTF8ToWide(gurl.PathForRequest());
}
std::wstring GetPathAndQueryFromUrl(const std::wstring& url) {
- base::string16 url16 = WideToUTF16(url);
+ base::string16 url16 = base::WideToUTF16(url);
GURL gurl = GURL(url16);
- return UTF8ToWide(gurl.PathForRequest());
+ return base::UTF8ToWide(gurl.PathForRequest());
}
std::wstring GetClipboardText() {
base::string16 text16;
ui::Clipboard::GetForCurrentThread()->ReadText(
ui::CLIPBOARD_TYPE_COPY_PASTE, &text16);
- return UTF16ToWide(text16);
+ return base::UTF16ToWide(text16);
}
void DestroyClipboard() {
@@ -543,7 +543,7 @@ void SetClipboardText(const std::wstring& text) {
ui::ScopedClipboardWriter clipboard_writer(
ui::Clipboard::GetForCurrentThread(),
ui::CLIPBOARD_TYPE_COPY_PASTE);
- clipboard_writer.WriteText(WideToUTF16(text));
+ clipboard_writer.WriteText(base::WideToUTF16(text));
}
bool AddCFMetaTag(std::string* html_data) {
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.h ('k') | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698