Update from https://crrev.com/314320

net/base/filename_util_internal.cc

 // Copyright 2014 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 "net/base/filename_util.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 184 matching lines @@
   // with the preferred extension for the MIME type if one is available.
   if (IsShellIntegratedExtension(extension))
     extension.assign(default_extension);
 #endif
 
   *file_name = file_name->ReplaceExtension(extension);
 }
 
 bool FilePathToString16(const base::FilePath& path, base::string16* converted) {
 #if defined(OS_WIN)
-  return base::WideToUTF16(
-      path.value().c_str(), path.value().size(), converted);
+  *converted = path.value();
+  return true;
 #elif defined(OS_POSIX)
   std::string component8 = path.AsUTF8Unsafe();
   return !component8.empty() &&
          base::UTF8ToUTF16(component8.c_str(), component8.size(), converted);
 #endif
 }
 
 base::string16 GetSuggestedFilenameImpl(
     const GURL& url,
     const std::string& content_disposition,
@@ skipping 101 matching lines @@
   base::FilePath generated_name(
       base::SysWideToNativeMB(base::UTF16ToWide(file_name)));
 #endif
 
   DCHECK(!generated_name.empty());
 
   return generated_name;
 }
 
 }  // namespace net