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

content/browser/download/download_manager_impl_unittest.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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 49 matching lines @@
 using content::DownloadId;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
 using ::testing::ReturnRef;
 using ::testing::Return;
 
 namespace {
 
 FilePath GetTempDownloadPath(const FilePath& suggested_path) {
-  return DownloadFile::AppendSuffixToPath(
-      suggested_path, FILE_PATH_LITERAL(".temp"));
+  return FilePath(suggested_path.value() + FILE_PATH_LITERAL(".temp"));
 }
 
 class MockDownloadFileFactory
     : public DownloadFileManager::DownloadFileFactory {
  public:
   MockDownloadFileFactory() {}
 
   virtual DownloadFile* CreateFile(DownloadCreateInfo* info,
                                    const DownloadRequestHandle& request_handle,
                                    DownloadManager* download_manager,
@@ skipping 1070 matching lines @@
   EXPECT_FALSE(file_util::PathExists(new_path));
 
   // Create the file that we will overwrite.  Will be automatically cleaned
   // up when temp_dir_ is destroyed.
   FILE* fp = file_util::OpenFile(new_path, "w");
   file_util::CloseFile(fp);
   EXPECT_TRUE(file_util::PathExists(new_path));
 
   // Construct the unique file name that normally would be created, but
   // which we will override.
-  int uniquifier = DownloadFile::GetUniquePathNumber(new_path);
+  int uniquifier =
+      file_util::GetUniquePathNumber(new_path, FILE_PATH_LITERAL(""));
   FilePath unique_new_path = new_path;
   EXPECT_NE(0, uniquifier);
-  DownloadFile::AppendNumberToPath(&unique_new_path, uniquifier);
+  unique_new_path = unique_new_path.InsertBeforeExtensionASCII(
+            StringPrintf(" (%d)", uniquifier));
 
   // Normally, the download system takes ownership of info, and is
   // responsible for deleting it.  In these unit tests, however, we
   // don't call the function that deletes it, so we do so ourselves.
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   info->download_id = DownloadId(kValidIdDomain, 0);
   info->prompt_user_for_save_location = true;
   info->url_chain.push_back(GURL());
 
   download_manager_->CreateDownloadItem(info.get(), DownloadRequestHandle());
@@ skipping 127 matching lines @@
   EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));
   EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE));
   EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
   EXPECT_TRUE(observer->was_updated());
   EXPECT_FALSE(observer->was_opened());
   EXPECT_TRUE(download->GetFileExternallyRemoved());
   EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
 
   EXPECT_FALSE(file_util::PathExists(new_path));
 }