| Index: chrome/common/zip.cc
|
| diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc
|
| index 3e24b53d72fc40ac667e32a9569e98201e992208..d5ff5d00c12795f526209513e322c7345a3d4dd3 100644
|
| --- a/chrome/common/zip.cc
|
| +++ b/chrome/common/zip.cc
|
| @@ -206,7 +206,7 @@ static bool AddFileToZip(zipFile zip_file, const FilePath& src_dir) {
|
| 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;
|
| }
|
|
|
| @@ -217,7 +217,7 @@ static bool AddFileToZip(zipFile zip_file, const FilePath& src_dir) {
|
| 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;
|
| }
|
| }
|
| @@ -296,7 +296,7 @@ bool Zip(const FilePath& src_dir, const FilePath& dest_file,
|
| 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)) {
|
|
|