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

content/browser/download/download_file_impl.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 "content/browser/download/download_file_impl.h"
 
 #include <string>
 
 #include "base/file_util.h"
-#include "base/stringprintf.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 
 using content::BrowserThread;
 using content::DownloadId;
 
-namespace {
-
-// 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 content {
-
-// static
-void DownloadFile::AppendNumberToPath(FilePath* path, int number) {
-  *path = path->InsertBeforeExtensionASCII(StringPrintf(" (%d)", number));
-}
-
-// static
-FilePath DownloadFile::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());
-  return FilePath(file_name);
-}
-
-// static
-int DownloadFile::GetUniquePathNumber(const FilePath& path) {
-  if (!file_util::PathExists(path))
-    return 0;
-
-  FilePath new_path;
-  for (int count = 1; count <= kMaxUniqueFiles; ++count) {
-    new_path = FilePath(path);
-    AppendNumberToPath(&new_path, count);
-
-    if (!file_util::PathExists(new_path))
-      return count;
-  }
-
-  return -1;
-}
-
-// static
-int DownloadFile::GetUniquePathNumberWithSuffix(
-    const FilePath& path,
-    const FilePath::StringType& suffix) {
-  if (!file_util::PathExists(path) &&
-      !file_util::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 (!file_util::PathExists(new_path) &&
-        !file_util::PathExists(AppendSuffixToPath(new_path, suffix)))
-      return count;
-  }
-
-  return -1;
-}
-
-}
-
 DownloadFileImpl::DownloadFileImpl(
     const DownloadCreateInfo* info,
     DownloadRequestHandleInterface* request_handle,
     content::DownloadManager* download_manager,
     bool calculate_hash)
     : file_(info->save_info.file_path,
             info->url(),
             info->referrer_url,
             info->received_bytes,
             calculate_hash,
@@ skipping 85 matching lines @@
 std::string DownloadFileImpl::DebugString() const {
   return base::StringPrintf("{"
                             " id_ = " "%d"
                             " request_handle = %s"
                             " Base File = %s"
                             " }",
                             id_.local(),
                             request_handle_->DebugString().c_str(),
                             file_.DebugString().c_str());
 }