Move path functions from file_util to FilePath object.

base/file_util.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/file_util.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #endif
 #include <stdio.h>
@@ skipping 19 matching lines @@
 // extension, where 1 <= nnn <= kMaxUniqueFiles.
 // Also used by code that cleans up said files.
 static const int kMaxUniqueFiles = 100;
 
 }  // namespace
 
 namespace file_util {
 
 bool g_bug108724_debug = false;
 
-bool EndsWithSeparator(const FilePath& path) {
-  FilePath::StringType value = path.value();
-  if (value.empty())
-    return false;
-
-  return FilePath::IsSeparator(value[value.size() - 1]);
-}
-
-bool EnsureEndsWithSeparator(FilePath* path) {
-  if (!DirectoryExists(*path))
-    return false;
-
-  if (EndsWithSeparator(*path))
-    return true;
-
-  FilePath::StringType& path_str =
-      const_cast<FilePath::StringType&>(path->value());
-  path_str.append(&FilePath::kSeparators[0], 1);
-
-  return true;
-}
-
 void InsertBeforeExtension(FilePath* path, const FilePath::StringType& suffix) {
   FilePath::StringType& value =
       const_cast<FilePath::StringType&>(path->value());
 
   const FilePath::StringType::size_type last_dot =
       value.rfind(kExtensionSeparator);
   const FilePath::StringType::size_type last_separator =
       value.find_last_of(FilePath::StringType(FilePath::kSeparators));
 
   if (last_dot == FilePath::StringType::npos ||
@@ skipping 210 matching lines @@
         path.InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", count));
     if (!PathExists(new_path) &&
         (!have_suffix || !PathExists(FilePath(new_path.value() + suffix)))) {
       return count;
     }
   }
 
   return -1;
 }
 
-bool ContainsPath(const FilePath &parent, const FilePath& child) {
-  FilePath abs_parent = FilePath(parent);
-  FilePath abs_child = FilePath(child);
-
-  if (!file_util::AbsolutePath(&abs_parent) ||
-      !file_util::AbsolutePath(&abs_child))
-    return false;
-
-#if defined(OS_WIN)
-  // file_util::AbsolutePath() does not flatten case on Windows, so we must do
-  // a case-insensitive compare.
-  if (!StartsWith(abs_child.value(), abs_parent.value(), false))
-#else
-  if (!StartsWithASCII(abs_child.value(), abs_parent.value(), true))
-#endif
-    return false;
-
-  // file_util::AbsolutePath() normalizes '/' to '\' on Windows, so we only need
-  // to check kSeparators[0].
-  if (abs_child.value().length() <= abs_parent.value().length() ||
-      abs_child.value()[abs_parent.value().length()] !=
-          FilePath::kSeparators[0])
-    return false;
-
-  return true;
-}
-
 int64 ComputeDirectorySize(const FilePath& root_path) {
   int64 running_size = 0;
   FileEnumerator file_iter(root_path, true, FileEnumerator::FILES);
   for (FilePath current = file_iter.Next(); !current.empty();
        current = file_iter.Next()) {
     FileEnumerator::FindInfo info;
     file_iter.GetFindInfo(&info);
 #if defined(OS_WIN)
     LARGE_INTEGER li = { info.nFileSizeLow, info.nFileSizeHigh };
     running_size += li.QuadPart;
 #else
     running_size += info.stat.st_size;
 #endif
   }
   return running_size;
 }
 
 ///////////////////////////////////////////////
 // FileEnumerator
 //
 // Note: the main logic is in file_util_<platform>.cc
 
 bool FileEnumerator::ShouldSkip(const FilePath& path) {
   FilePath::StringType basename = path.BaseName().value();
   return IsDot(path) || (IsDotDot(path) && !(INCLUDE_DOT_DOT & file_type_));
 }
 
 }  // namespace