Move common file path related methods between chrome & content to file_util. I reduced the 4 meth...

base/file_util.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_util.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #endif
 #include <stdio.h>
 
 #include <fstream>
 
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/stringprintf.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
 namespace {
 
 const FilePath::CharType kExtensionSeparator = FILE_PATH_LITERAL('.');
 
+// The maximum number of 'uniquified' files we will try to create.
+// This is used when the filename we're trying to download is already in use,
+// so we create a new unique filename by appending " (nnn)" before the
+// extension, where 1 <= nnn <= kMaxUniqueFiles.
+// Also used by code that cleans up said files.
+static const int kMaxUniqueFiles = 100;
+
 }  // namespace
 
 namespace file_util {
 
 bool EndsWithSeparator(const FilePath& path) {
   FilePath::StringType value = path.value();
   if (value.empty())
     return false;
 
   return FilePath::IsSeparator(value[value.size() - 1]);
@@ skipping 196 matching lines @@
   if (_chsize(fd, current_offset) != 0)
     return false;
 #else
   int fd = fileno(file);
   if (ftruncate(fd, current_offset) != 0)
     return false;
 #endif
   return true;
 }
 
+int GetUniquePathNumber(

[Evan Martin, 2012/01/31 21:23:44]

Should this be in the anon namespace?

[jam, 2012/01/31 21:54:30]

no it's in the header, it's used by a few places

+    const FilePath& path,
+    const FilePath::StringType& suffix) {
+  bool have_suffix = !suffix.empty();
+  if (!PathExists(path) &&
+      (!have_suffix || !PathExists(AppendSuffixToPath(path, suffix)))) {
+    return 0;
+  }
+
+  FilePath new_path;
+  for (int count = 1; count <= kMaxUniqueFiles; ++count) {
+    new_path = FilePath(path);
+    AppendNumberToPath(&new_path, count);
+
+    if (!PathExists(new_path) &&
+        (!have_suffix || !PathExists(AppendSuffixToPath(new_path, 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;
 }
 
+void AppendNumberToPath(FilePath* path, int number) {
+  *path = path->InsertBeforeExtensionASCII(StringPrintf(" (%d)", number));
+}
+
+FilePath AppendSuffixToPath(
+    const FilePath& path,
+    const FilePath::StringType& suffix) {
+  FilePath::StringType file_name;
+  base::SStringPrintf(
+      &file_name, PRFilePathLiteral PRFilePathLiteral, path.value().c_str(),
+      suffix.c_str());

[Evan Martin, 2012/01/31 21:23:44]

Simpler:

return FilePath(path.value() + suffix)

in fact, with that in mind, maybe it should be up to the caller to do this.

[jam, 2012/01/31 21:54:30]

good point, done!

also same for AppendNumberToPath, I figured it's just a one liner so I made
callers do it.

+  return FilePath(file_name);
+}
+
 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;
@@ skipping 116 matching lines @@
 // 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