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

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 15 matching lines @@
 #include "base/values.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/download/download_create_info.h"
-#include "content/browser/download/download_file.h"
 #include "content/browser/download/download_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/mime_util.h"
@@ skipping 539 matching lines @@
       taskbar->SetProgressValue(frame, static_cast<int>(progress * 100), 100);
   }
 #elif defined(TOOLKIT_GTK)
   unity::SetDownloadCount(download_count);
   unity::SetProgressFraction(progress);
 #endif
 }
 #endif
 
 int GetUniquePathNumberWithCrDownload(const FilePath& path) {
-  return DownloadFile::GetUniquePathNumberWithSuffix(
+  return file_util::GetUniquePathNumber(
       path, FILE_PATH_LITERAL(".crdownload"));
 }
 
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
-  return DownloadFile::AppendSuffixToPath(
-      suggested_path, FILE_PATH_LITERAL(".crdownload"));
+  return FilePath(suggested_path.value() + FILE_PATH_LITERAL(".crdownload"));
 }
 
 bool IsSavableURL(const GURL& url) {
   for (int i = 0; chrome::GetSavableSchemes()[i] != NULL; ++i) {
     if (url.SchemeIs(chrome::GetSavableSchemes()[i])) {
       return true;
     }
   }
   return false;
 }
@@ skipping 16 matching lines @@
                               kMaxShelfSize);
   }
 }
 
 void RecordDownloadCount(ChromeDownloadCountTypes type) {
   UMA_HISTOGRAM_ENUMERATION(
       "Download.CountsChrome", type, DOWNLOAD_COUNT_TYPES_LAST_ENTRY);
 }
 
 }  // namespace download_util