FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 352 matching lines @@
     EXPECT_TRUE(file_util::ContentsEqual(downloaded_file, origin_file));
 
     // Delete the downloaded copy of the file.
     bool downloaded_file_deleted =
         file_util::DieFileDie(downloaded_file, false);
     EXPECT_TRUE(downloaded_file_deleted);
     return downloaded_file_deleted;
   }
 
   // TODO(ahendrickson) -- |expected_title_in_progress| and
-  // |expected_title_in_finished| need to be checked.
+  // |expected_title_finished| need to be checked.
   bool RunSizeTest(Browser* browser,
                    const GURL& url,
-                   const std::wstring& expected_title_in_progress,
-                   const std::wstring& expected_title_finished) {
+                   const string16& expected_title_in_progress,
+                   const string16& expected_title_finished) {
     if (!InitialSetup(false))
       return false;
 
     // Download a partial web page in a background tab and wait.
     // The mock system will not complete until it gets a special URL.
     scoped_ptr<DownloadsObserver> observer(CreateWaiter(browser, 1));
     ui_test_utils::NavigateToURL(browser, url);
 
     // TODO(ahendrickson): check download status text before downloading.
     // Need to:
@@ skipping 218 matching lines @@
 // Test is believed mostly good (non-flaky) in itself, but it
 // very occasionally trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_UnknownSize) {
   GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
-  ASSERT_TRUE(RunSizeTest(browser(),
-                          url,
-                          L"32.0 KB - " + filename.ToWStringHack(),
-                          L"100% - " + filename.ToWStringHack()));
+  ASSERT_TRUE(RunSizeTest(
+                  browser(),
+                  url,
+                  ASCIIToUTF16("32.0 KB - ") + filename.LossyDisplayName(),
+                  ASCIIToUTF16("100% - ") + filename.LossyDisplayName()));
 }
 
 // Test is believed mostly good (non-flaky) in itself, but it
 // very occasionally trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_KnownSize) {
   GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
-  ASSERT_TRUE(RunSizeTest(browser(),
-                          url,
-                          L"71% - " + filename.ToWStringHack(),
-                          L"100% - " + filename.ToWStringHack()));
+  ASSERT_TRUE(RunSizeTest(
+                  browser(),
+                  url,
+                  ASCIIToUTF16("71% - ") + filename.LossyDisplayName(),
+                  ASCIIToUTF16("100% - ") + filename.LossyDisplayName()));
 }
 
 // Test that when downloading an item in Incognito mode, we don't crash when
 // closing the last Incognito window (http://crbug.com/13983).
 // Also check that the download shelf is not visible after closing the
 // Incognito window.
 //
 // Test is believed mostly good (non-flaky) in itself, but it
 // sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  Until that bug is
@@ skipping 297 matching lines @@
   window_count = BrowserList::size();
   EXPECT_EQ(1, window_count);
   EXPECT_EQ(1, browser()->tab_count());
   // The download shelf should not be visible in the remaining window.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 
   CheckDownload(browser(), file, file);
 }
 
 }  // namespace