| 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);
|
|
|