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

chrome/browser/web_applications/web_app.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 "chrome/browser/web_applications/web_app.h"
 
 #if defined(OS_WIN)
 #include <shlobj.h>
 #endif  // defined(OS_WIN)
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/md5.h"
 #include "base/path_service.h"
+#include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/download/download_file.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 256 matching lines @@
   std::wstring app_id = ShellIntegration::GetAppId(
       UTF8ToWide(app_name), profile_path);
 
   FilePath shortcut_to_pin;
 
   bool success = true;
   for (size_t i = 0; i < shortcut_paths.size(); ++i) {
     FilePath shortcut_file = shortcut_paths[i].Append(file_name).
         ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
 
-    int unique_number = DownloadFile::GetUniquePathNumber(shortcut_file);
+    int unique_number =
+        file_util::GetUniquePathNumber(shortcut_file, FILE_PATH_LITERAL(""));
     if (unique_number == -1) {
       success = false;
       continue;
     } else if (unique_number > 0) {
-      DownloadFile::AppendNumberToPath(&shortcut_file, unique_number);
+      shortcut_file = shortcut_file.InsertBeforeExtensionASCII(
+          StringPrintf(" (%d)", unique_number));
     }
 
     success &= file_util::CreateShortcutLink(chrome_exe.value().c_str(),
         shortcut_file.value().c_str(),
         chrome_folder.value().c_str(),
         wide_switches.c_str(),
         description.c_str(),
         icon_file.value().c_str(),
         0,
         app_id.c_str());
@@ skipping 164 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app