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

content/browser/download/download_file_manager_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 "content/browser/download/download_file_manager.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 277 matching lines @@
     //    On Success, if final rename:
     //  Process one message in the message loop
     //    DownloadManager::OnDownloadRenamedToFinalName
     MockDownloadFile* file = download_file_factory_->GetExistingFile(id);
     ASSERT_TRUE(file != NULL);
 
     FilePath unique_path = new_path;
     int uniquifier = 0;
 
     if (is_complete && !replace) {
-      uniquifier = content::DownloadFile::GetUniquePathNumber(new_path);
-      if (uniquifier > 0)
-        content::DownloadFile::AppendNumberToPath(&unique_path, uniquifier);
+      uniquifier =
+          file_util::GetUniquePathNumber(new_path, FILE_PATH_LITERAL(""));
+      if (uniquifier > 0) {
+        unique_path = unique_path.InsertBeforeExtensionASCII(
+            StringPrintf(" (%d)", uniquifier));
+      }
     }
 
     EXPECT_CALL(*file, Rename(unique_path))
         .Times(1)
         .WillOnce(Return(error_to_insert));
 
     if (error_to_insert != net::OK) {
       EXPECT_CALL(*file, GetDownloadManager());
 
       EXPECT_CALL(*file, BytesSoFar())
@@ skipping 347 matching lines @@
 //    DownloadFile::GetDownloadFile
 //  Process one message in the message loop
 //    DownloadManager::UpdateDownload
 
 // TODO(ahendrickson) -- A test for download manager shutdown.
 // Expected call sequence:
 //  OnDownloadManagerShutdown
 //    DownloadFile::GetDownloadManager
 //    DownloadFile::CancelDownloadRequest
 //    DownloadFile::~DownloadFile