1 files changed, 12 insertions, 13 deletions

diff --git a/chromium/chrome/browser/extensions/api/downloads/downloads_api.h b/chromium/chrome/browser/extensions/api/downloads/downloads_api.h
index 084d39b0bc1..cd6e5759ce8 100644
--- a/chromium/chrome/browser/extensions/api/downloads/downloads_api.h
+++ b/chromium/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -69,9 +69,9 @@ namespace extensions {
 
 class DownloadedByExtension : public base::SupportsUserData::Data {
  public:
-  static DownloadedByExtension* Get(content::DownloadItem* item);
+  static DownloadedByExtension* Get(download::DownloadItem* item);
 
-  DownloadedByExtension(content::DownloadItem* item,
+  DownloadedByExtension(download::DownloadItem* item,
                         const std::string& id,
                         const std::string& name);
 
@@ -100,8 +100,8 @@ class DownloadsDownloadFunction : public ChromeAsyncExtensionFunction {
   void OnStarted(const base::FilePath& creator_suggested_filename,
                  extensions::api::downloads::FilenameConflictAction
                      creator_conflict_action,
-                 content::DownloadItem* item,
-                 content::DownloadInterruptReason interrupt_reason);
+                 download::DownloadItem* item,
+                 download::DownloadInterruptReason interrupt_reason);
 
   DISALLOW_COPY_AND_ASSIGN(DownloadsDownloadFunction);
 };
@@ -330,7 +330,7 @@ class ExtensionDownloadsEventRouter
   // existing files, then |overwrite| will be true. Returns true on success,
   // false otherwise.
   static bool DetermineFilename(
-      Profile* profile,
+      content::BrowserContext* browser_context,
       bool include_incognito,
       const std::string& ext_id,
       int download_id,
@@ -352,19 +352,18 @@ class ExtensionDownloadsEventRouter
   // an extension wants to change the target filename, then |change| will be
   // called with the new filename and a flag indicating whether the new file
   // should overwrite any old files of the same name.
-  void OnDeterminingFilename(
-      content::DownloadItem* item,
-      const base::FilePath& suggested_path,
-      const base::Closure& no_change,
-      const FilenameChangedCallback& change);
+  void OnDeterminingFilename(download::DownloadItem* item,
+                             const base::FilePath& suggested_path,
+                             const base::Closure& no_change,
+                             const FilenameChangedCallback& change);
 
   // AllDownloadItemNotifier::Observer.
   void OnDownloadCreated(content::DownloadManager* manager,
-                         content::DownloadItem* download_item) override;
+                         download::DownloadItem* download_item) override;
   void OnDownloadUpdated(content::DownloadManager* manager,
-                         content::DownloadItem* download_item) override;
+                         download::DownloadItem* download_item) override;
   void OnDownloadRemoved(content::DownloadManager* manager,
-                         content::DownloadItem* download_item) override;
+                         download::DownloadItem* download_item) override;
 
   // extensions::EventRouter::Observer.
   void OnListenerRemoved(const extensions::EventListenerInfo& details) override;