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

chrome/common/zip.cc

 // Copyright (c) 2009 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 "chrome/common/zip.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 188 matching lines @@
   }
   unzClose(zip_file);
   return ret;
 }
 
 static bool AddFileToZip(zipFile zip_file, const FilePath& src_dir) {
   net::FileStream stream;
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
   if (stream.Open(src_dir, flags) != 0) {
     LOG(ERROR) << "Could not open stream for path "
-               << WideToASCII(src_dir.ToWStringHack());
+               << src_dir.value();
     return false;
   }
 
   int num_bytes;
   char buf[kZipBufSize];
   do {
     num_bytes = stream.Read(buf, kZipBufSize, NULL);
     if (num_bytes > 0) {
       if (ZIP_OK != zipWriteInFileInZip(zip_file, buf, num_bytes)) {
         LOG(ERROR) << "Could not write data to zip for path "
-                   << WideToASCII(src_dir.ToWStringHack());
+                   << src_dir.value();
         return false;
       }
     }
   } while (num_bytes > 0);
 
   return true;
 }
 
 static bool AddEntryToZip(zipFile zip_file, const FilePath& path,
                           const FilePath& root_path) {
@@ skipping 58 matching lines @@
   }
 
   bool success = true;
   file_util::FileEnumerator file_enumerator(
       src_dir, true,  // recursive
       static_cast<file_util::FileEnumerator::FILE_TYPE>(
           file_util::FileEnumerator::FILES |
           file_util::FileEnumerator::DIRECTORIES));
   for (FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
-    if (!include_hidden_files && path.BaseName().ToWStringHack()[0] == L'.')
+    if (!include_hidden_files && path.BaseName().value()[0] == '.')
       continue;
 
     if (!AddEntryToZip(zip_file, path, src_dir)) {
       success = false;
       return false;
     }
   }
 
   if (ZIP_OK != zipClose(zip_file, NULL)) {  // global comment
     LOG(ERROR) << "Error closing zip file " << dest_file_str;
     return false;
   }
 
   return success;
 }