Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb

1 files changed, 5 insertions, 5 deletions

diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h
index 6885068654..7458433b48 100644
--- a/content/browser/download/download_manager_impl.h
+++ b/content/browser/download/download_manager_impl.h
@@ -36,6 +36,7 @@ class CONTENT_EXPORT DownloadManagerImpl : public DownloadManager,
   // Caller guarantees that |net_log| will remain valid
   // for the lifetime of DownloadManagerImpl (until Shutdown() is called).
   DownloadManagerImpl(net::NetLog* net_log, BrowserContext* browser_context);
+  virtual ~DownloadManagerImpl();
 
   // Implementation functions (not part of the DownloadManager interface).
 
@@ -102,13 +103,10 @@ class CONTENT_EXPORT DownloadManagerImpl : public DownloadManager,
   friend class DownloadManagerTest;
   friend class DownloadTest;
 
-  friend class base::RefCountedThreadSafe<DownloadManagerImpl>;
-
-  virtual ~DownloadManagerImpl();
-
   // Create a new active item based on the info.  Separate from
   // StartDownload() for testing.
-  void CreateActiveItem(DownloadId id, const DownloadCreateInfo& info);
+  DownloadItemImpl* CreateActiveItem(DownloadId id,
+                                     const DownloadCreateInfo& info);
 
   // Get next download id.
   DownloadId GetNextId();
@@ -165,6 +163,8 @@ class CONTENT_EXPORT DownloadManagerImpl : public DownloadManager,
 
   net::NetLog* net_log_;
 
+  base::WeakPtrFactory<DownloadManagerImpl> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerImpl);
 };