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

Unified Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (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/simple_resource_loader.cc ('k') | chrome_frame/test/delete_chrome_history_test.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 8dfc86e128d1121cc6da0339504c9992eedb3c67..df912de2984940c8117fec3f61406aa3298c6e6d 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -512,7 +512,7 @@ base::FilePath GetSeleniumTestFolder() {
}
std::wstring GetPathFromUrl(const std::wstring& url) {
- string16 url16 = WideToUTF16(url);
+ base::string16 url16 = WideToUTF16(url);
GURL gurl = GURL(url16);
if (gurl.has_query()) {
GURL::Replacements replacements;
@@ -523,13 +523,13 @@ std::wstring GetPathFromUrl(const std::wstring& url) {
}
std::wstring GetPathAndQueryFromUrl(const std::wstring& url) {
- string16 url16 = WideToUTF16(url);
+ base::string16 url16 = WideToUTF16(url);
GURL gurl = GURL(url16);
return UTF8ToWide(gurl.PathForRequest());
}
std::wstring GetClipboardText() {
- string16 text16;
+ base::string16 text16;
ui::Clipboard::GetForCurrentThread()->ReadText(
ui::CLIPBOARD_TYPE_COPY_PASTE, &text16);
return UTF16ToWide(text16);
« no previous file with comments | « chrome_frame/simple_resource_loader.cc ('k') | chrome_frame/test/delete_chrome_history_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698