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

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 123b2924d03ea3a11ef7eede4b3acc0efd356d47..524d695e3e685cf102482126076302aa1efe14aa 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -370,11 +370,11 @@ class DownloadTest : public InProcessBrowserTest {
   }
 
   // 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;
 
@@ -613,10 +613,11 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_UnknownSize) {
   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
@@ -629,10 +630,11 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_KnownSize) {
   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