Do some cleanup of file path name handling.

printing/printed_document.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 "printing/printed_document.h"
 
 #include <set>
 
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
@@ skipping 245 matching lines @@
 
   std::wstring filename;
   filename += date();
   filename += L"_";
   filename += time();
   filename += L"_";
   filename += name();
   filename += L"_";
   filename += StringPrintf(L"%02d", page.page_number());
   filename += L"_.emf";
-  file_util::ReplaceIllegalCharacters(&filename, '_');
+#if defined(OS_WIN)
+  file_util::ReplaceIllegalCharactersInPath(&filename, '_');
+#else
+  std::string narrow_filename = WideToUTF8(filename);
+  file_util::ReplaceIllegalCharactersInPath(&narrow_filename, '_');
+  filename = UTF8ToWide(narrow_filename);
+#endif
   std::wstring path(g_debug_dump_info->debug_dump_path);
   file_util::AppendToPath(&path, filename);
 #if defined(OS_WIN)
   page.native_metafile()->SaveTo(path);
 #else  // OS_WIN
   NOTIMPLEMENTED();
 #endif  // OS_WIN
 }
 
 void PrintedDocument::set_debug_dump_path(const std::wstring& debug_dump_path) {
@@ skipping 28 matching lines @@
   date_ = win_util::FormatSystemDate(systemtime, std::wstring());
   time_ = win_util::FormatSystemTime(systemtime, std::wstring());
 #else  // OS_WIN
   Time now = Time::Now();
   date_ = base::TimeFormatShortDateNumeric(now);
   time_ = base::TimeFormatTimeOfDay(now);
 #endif  // OS_WIN
 }
 
 }  // namespace printing