FilePath: remove some functions that aren't really used.

base/file_path.cc

 // Copyright (c) 2011 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/file_path.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 533 matching lines @@
     return WideToASCII(path_);
   return "";
 }
 
 // static
 FilePath FilePath::FromWStringHack(const std::wstring& wstring) {
   return FilePath(wstring);
 }
 #endif
 
-// static.
-void FilePath::WriteStringTypeToPickle(Pickle* pickle,
-                                       const StringType& path) {
-#if defined(WCHAR_T_IS_UTF16)
-  pickle->WriteWString(path);
-#elif defined(WCHAR_T_IS_UTF32)
-  pickle->WriteString(path);
+void FilePath::WriteToPickle(Pickle* pickle) {
+#if defined(OS_WIN)
+  pickle->WriteString16(path_);
 #else
-  NOTIMPLEMENTED() << "Impossible encoding situation!";
+  pickle->WriteString(path_);
 #endif
 }
 
-// static.
-bool FilePath::ReadStringTypeFromPickle(Pickle* pickle, void** iter,
-                                        StringType* path) {
-#if defined(WCHAR_T_IS_UTF16)
-  if (!pickle->ReadWString(iter, path))
-    return false;
-#elif defined(WCHAR_T_IS_UTF32)
-  if (!pickle->ReadString(iter, path))
+bool FilePath::ReadFromPickle(Pickle* pickle, void** iter) {
+#if defined(OS_WIN)
+  if (!pickle->ReadString16(iter, &path_))
     return false;
 #else
-  NOTIMPLEMENTED() << "Impossible encoding situation!";
-  return false;
+  if (!pickle->ReadString(iter, &path_))
+    return false;
 #endif
 
   return true;
 }
 
-void FilePath::WriteToPickle(Pickle* pickle) {
-  WriteStringTypeToPickle(pickle, value());
-}
-
-bool FilePath::ReadFromPickle(Pickle* pickle, void** iter) {
-  return ReadStringTypeFromPickle(pickle, iter, &path_);
-}
-
 #if defined(OS_WIN)
 // Windows specific implementation of file string comparisons
 
 int FilePath::CompareIgnoreCase(const StringType& string1,
                                 const StringType& string2) {
   // Perform character-wise upper case comparison rather than using the
   // fully Unicode-aware CompareString(). For details see:
   // http://blogs.msdn.com/michkap/archive/2005/10/17/481600.aspx
   StringType::const_iterator i1 = string1.begin();
   StringType::const_iterator i2 = string2.begin();
@@ skipping 601 matching lines @@
 
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
 FilePath FilePath::NormalizeWindowsPathSeparators() const {
   StringType copy = path_;
   for (size_t i = 1; i < arraysize(kSeparators); ++i) {
     std::replace(copy.begin(), copy.end(), kSeparators[i], kSeparators[0]);
   }
   return FilePath(copy);
 }
 #endif