Add FilePath::{As,From}UTF16Unsafe

base/files/file_path.cc

 // Copyright (c) 2012 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 "base/files/file_path.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 559 matching lines @@
 }
 
 std::string FilePath::AsUTF8Unsafe() const {
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   return value();
 #else
   return WideToUTF8(SysNativeMBToWide(value()));
 #endif
 }
 
+string16 FilePath::AsUTF16Unsafe() const {
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+  return UTF8ToUTF16(value());
+#else
+  return WideToUTF16(SysNativeMBToWide(value()));
+#endif
+}
+
 // The *Hack functions are temporary while we fix the remainder of the code.
 // Remember to remove the #includes at the top when you remove these.
 
 // static
 FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
   return FilePath(SysWideToNativeMB(wstring));
 }
 
 // static
 FilePath FilePath::FromUTF8Unsafe(const std::string& utf8) {
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   return FilePath(utf8);
 #else
   return FilePath(SysWideToNativeMB(UTF8ToWide(utf8)));
 #endif
 }
 
+// static
+FilePath FilePath::FromUTF16Unsafe(const string16& utf16) {
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+  return FilePath(UTF16ToUTF8(utf16));
+#else
+  return FilePath(SysWideToNativeMB(UTF16ToWide(utf16)));
+#endif
+}
+
 #elif defined(OS_WIN)
 string16 FilePath::LossyDisplayName() const {
   return path_;
 }
 
 std::string FilePath::MaybeAsASCII() const {
   if (IsStringASCII(path_))
     return WideToASCII(path_);
   return "";
 }
 
 std::string FilePath::AsUTF8Unsafe() const {
   return WideToUTF8(value());
 }
 
+string16 FilePath::AsUTF16Unsafe() const {
+  return value();
+}
+
 // static
 FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
   return FilePath(wstring);
 }
 
 // static
 FilePath FilePath::FromUTF8Unsafe(const std::string& utf8) {
   return FilePath(UTF8ToWide(utf8));
 }
+
+// static
+FilePath FilePath::FromUTF16Unsafe(const string16& utf16) {
+  return FilePath(utf16);
+}
 #endif
 
 void FilePath::WriteToPickle(Pickle* pickle) const {
 #if defined(OS_WIN)
   pickle->WriteString16(path_);
 #else
   pickle->WriteString(path_);
 #endif
 }
 
@@ skipping 634 matching lines @@
 #else
   return *this;
 #endif
 }
 
 }  // namespace base
 
 void PrintTo(const base::FilePath& path, std::ostream* out) {
   *out << path.value();
 }