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

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 105193002: Replace string16 with base::string16. (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/browser/do_not_track_browsertest.cc ('k') | chrome/browser/download/download_danger_prompt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 9f9507913f5416d9d35a5e25458801a89a5a943b..99165e09a4a994a7a8d18416d444ee3932cab74d 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -745,9 +745,9 @@ class DownloadTest : public InProcessBrowserTest {
// |expected_title_finished| need to be checked.
base::FilePath filename;
net::FileURLToFilePath(url, &filename);
- string16 expected_title_in_progress(
+ base::string16 expected_title_in_progress(
ASCIIToUTF16(partial_indication) + filename.LossyDisplayName());
- string16 expected_title_finished(
+ base::string16 expected_title_finished(
ASCIIToUTF16(total_indication) + filename.LossyDisplayName());
// Download a partial web page in a background tab and wait.
@@ -2382,7 +2382,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
content::RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
ASSERT_TRUE(render_view_host != NULL);
render_view_host->ExecuteJavascriptInWebFrame(
- string16(), ASCIIToUTF16("SubmitForm()"));
+ base::string16(), ASCIIToUTF16("SubmitForm()"));
observer.Wait();
EXPECT_EQ(jpeg_url, web_contents->GetURL());
@@ -2897,7 +2897,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_CrazyFilenames) {
ASSERT_TRUE(base::CreateDirectory(DestinationFile(browser(), origin)));
for (size_t index = 0; index < arraysize(kCrazyFilenames); ++index) {
- string16 crazy16;
+ base::string16 crazy16;
std::string crazy8;
const wchar_t* crazy_w = kCrazyFilenames[index];
ASSERT_TRUE(WideToUTF8(crazy_w, wcslen(crazy_w), &crazy8));
« no previous file with comments | « chrome/browser/do_not_track_browsertest.cc ('k') | chrome/browser/download/download_danger_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698