Support restricting browsing data removal for downloads by origin.

content/browser/download/download_manager_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
 
+#include "base/callback.h"

[Randy Smith (Not in Mondays), 2015/08/05 16:02:04]

nit, suggestion: I think this could be callback_forward.h and you could just
include callback.h in the .cc file.

[Timo Reimann, 2015/08/05 20:07:46]

Nice, didn't know about callback_foward.h.

Done.

 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/lock.h"
 #include "content/browser/download/download_item_impl_delegate.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_manager.h"
@@ skipping 37 matching lines @@
 
   // DownloadManager functions.
   void SetDelegate(DownloadManagerDelegate* delegate) override;
   DownloadManagerDelegate* GetDelegate() const override;
   void Shutdown() override;
   void GetAllDownloads(DownloadVector* result) override;
   void StartDownload(
       scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<ByteStreamReader> stream,
       const DownloadUrlParameters::OnStartedCallback& on_started) override;
+
+  int RemoveDownloadsByOriginAndTime(const url::Origin& origin,
+                                     base::Time remove_begin,
+                                     base::Time remove_end) override;
   int RemoveDownloadsBetween(base::Time remove_begin,
                              base::Time remove_end) override;
   int RemoveDownloads(base::Time remove_begin) override;
   int RemoveAllDownloads() override;
   void DownloadUrl(scoped_ptr<DownloadUrlParameters> params) override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   content::DownloadItem* CreateDownloadItem(
       uint32 id,
       const base::FilePath& current_path,
@@ skipping 22 matching lines @@
   void SetDownloadItemFactoryForTesting(
       scoped_ptr<DownloadItemFactory> item_factory);
   void SetDownloadFileFactoryForTesting(
       scoped_ptr<DownloadFileFactory> file_factory);
   virtual DownloadFileFactory* GetDownloadFileFactoryForTesting();
 
  private:
   typedef std::set<DownloadItem*> DownloadSet;
   typedef base::hash_map<uint32, DownloadItemImpl*> DownloadMap;
   typedef std::vector<DownloadItemImpl*> DownloadItemImplVector;
+  typedef base::Callback<bool(const DownloadItemImpl*)> DownloadRemover;
 
   // For testing.
   friend class DownloadManagerTest;
   friend class DownloadTest;
 
   void StartDownloadWithId(
       scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<ByteStreamReader> stream,
       const DownloadUrlParameters::OnStartedCallback& on_started,
       bool new_download,
@@ skipping 14 matching lines @@
 
   // Get next download id. |callback| is called on the UI thread and may
   // be called synchronously.
   void GetNextId(const DownloadIdCallback& callback);
 
   // Called with the result of DownloadManagerDelegate::CheckForFileExistence.
   // Updates the state of the file and then notifies this update to the file's
   // observer.
   void OnFileExistenceChecked(uint32 download_id, bool result);
 
+  // Remove all downloads for which |remover| returns true.
+  int RemoveDownloads(const DownloadRemover& remover);
+
   // Overridden from DownloadItemImplDelegate
   // (Note that |GetBrowserContext| are present in both interfaces.)
   void DetermineDownloadTarget(DownloadItemImpl* item,
                                const DownloadTargetCallback& callback) override;
   bool ShouldCompleteDownload(DownloadItemImpl* item,
                               const base::Closure& complete_callback) override;
   bool ShouldOpenFileBasedOnExtension(const base::FilePath& path) override;
   bool ShouldOpenDownload(DownloadItemImpl* item,
                           const ShouldOpenDownloadCallback& callback) override;
   void CheckForFileRemoval(DownloadItemImpl* download_item) override;
@@ skipping 33 matching lines @@
   net::NetLog* net_log_;
 
   base::WeakPtrFactory<DownloadManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_