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

content/browser/download/download_file_manager.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 <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 381 matching lines @@
   int uniquifier = 0;
   FilePath new_path = full_path;
   if (!overwrite_existing_file) {
     // Make our name unique at this point, as if a dangerous file is
     // downloading and a 2nd download is started for a file with the same
     // name, they would have the same path.  This is because we uniquify
     // the name on download start, and at that time the first file does
     // not exists yet, so the second file gets the same name.
     // This should not happen in the SAFE case, and we check for that in the UI
     // thread.
-    uniquifier = DownloadFile::GetUniquePathNumber(new_path);
+    uniquifier =
+        file_util::GetUniquePathNumber(new_path, FILE_PATH_LITERAL(""));
     if (uniquifier > 0) {
-      DownloadFile::AppendNumberToPath(&new_path, uniquifier);
+      new_path = new_path.InsertBeforeExtensionASCII(
+          StringPrintf(" (%d)", uniquifier));
     }
   }
 
   // Rename the file, overwriting if necessary.
   net::Error rename_error = download_file->Rename(new_path);
   if (net::OK != rename_error) {
     // Error. Between the time the UI thread generated 'full_path' to the time
     // this code runs, something happened that prevents us from renaming.
     CancelDownloadOnRename(global_id, rename_error);
     return;
@@ skipping 55 matching lines @@
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }