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

chrome/browser/download/download_uitest.cc

 // Copyright (c) 2011 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 <sstream>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 61 matching lines @@
     download_util::EraseUniqueDownloadFiles(path_prefix);
   }
 
   virtual void SetUp() {
     UITest::SetUp();
     download_prefix_ = GetDownloadDirectory();
   }
 
  protected:
   void RunSizeTest(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) {
     FilePath filename;
     net::FileURLToFilePath(url, &filename);
     filename = filename.BaseName();
     CleanupDownloadFiles(filename);
 
     {
       EXPECT_EQ(1, GetTabCount());
 
       NavigateToURL(url);
       // Downloads appear in the shelf
@@ skipping 141 matching lines @@
 // in the middle until the server receives a second request for
 // "download-finish.  At that time, the download will finish.
 // All download tests are flaky on all platforms, http://crbug.com/35275,
 // http://crbug.com/48913.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, FLAKY_UnknownSize) {
   GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
-  RunSizeTest(url, L"32.0 KB - " + filename.ToWStringHack(),
-              L"100% - " + filename.ToWStringHack());
+  RunSizeTest(url,
+              ASCIIToUTF16("32.0 KB - ") + filename.LossyDisplayName(),
+              ASCIIToUTF16("100% - ") + filename.LossyDisplayName());
 }
 
 // All download tests are flaky on all platforms, http://crbug.com/35275,
 // http://crbug.com/48913.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, FLAKY_KnownSize) {
   GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
-  RunSizeTest(url, L"71% - " + filename.ToWStringHack(),
-              L"100% - " + filename.ToWStringHack());
+  RunSizeTest(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).
 // All download tests are flaky on all platforms, http://crbug.com/35275,
 // http://crbug.com/48913.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, DISABLED_IncognitoDownload) {
   // Open a regular window and sanity check default values for window / tab
   // count and shelf visibility.
@@ skipping 247 matching lines @@
   CleanupDownloadFiles(file);
   ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
     URLRequestMockHTTPJob::GetMockUrl(file), NEW_WINDOW));
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2));
 
   CheckDownload(file);
 }
 
 }  // namespace