Support restricting browsing data removal for downloads by origin.

content/browser/download/download_manager_impl.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.
 
 #include "content/browser/download/download_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 26 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/referrer.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/load_flags.h"
 #include "net/base/request_priority.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/url_request/url_request_context.h"
+#include "url/origin.h"
 
 namespace content {
 namespace {
 
 void BeginDownload(scoped_ptr<DownloadUrlParameters> params,
                    uint32 download_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and
   // DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so
   // we must down cast. RDHI is the only subclass of RDH as of 2012 May 4.
@@ skipping 70 matching lines @@
       params->resource_context(),
       params->render_process_host_id(),
       params->render_view_host_routing_id(),
       params->prefer_cache(),
       params->do_not_prompt_for_login(),
       save_info.Pass(),
       download_id,
       params->callback());
 }
 
+// Determines if the given URL should be removed. This is the case for URLs
+// that are same-origin with the given origin or where the given origin is
+// unique. The latter marks a sitation where we intend to clear all URLs.
+static bool IsRemovableURL(
+    const GURL& url, const url::Origin& origin_to_clear) {
+  url::Origin url_origin(url);
+
+  return origin_to_clear.unique() ||
+      origin_to_clear.IsSameOriginWith(url_origin);
+}
+
 class MapValueIteratorAdapter {
  public:
   explicit MapValueIteratorAdapter(
       base::hash_map<int64, DownloadItem*>::const_iterator iter)
     : iter_(iter) {
   }
   ~MapValueIteratorAdapter() {}
 
   DownloadItem* operator*() { return iter_->second; }
 
@@ skipping 411 matching lines @@
 void DownloadManagerImpl::DownloadRemoved(DownloadItemImpl* download) {
   if (!download)
     return;
 
   uint32 download_id = download->GetId();
   if (downloads_.erase(download_id) == 0)
     return;
   delete download;
 }
 
-int DownloadManagerImpl::RemoveDownloadsBetween(base::Time remove_begin,
-                                                base::Time remove_end) {
+int DownloadManagerImpl::RemoveDownloadsBetween(
+    const url::Origin& origin_to_clear,
+    base::Time remove_begin,
+    base::Time remove_end) {
   int count = 0;
   DownloadMap::const_iterator it = downloads_.begin();
   while (it != downloads_.end()) {
     DownloadItemImpl* download = it->second;
 
     // Increment done here to protect against invalidation below.
     ++it;
 
-    if (download->GetStartTime() >= remove_begin &&
+    if (IsRemovableURL(download->GetURL(), origin_to_clear) &&

[Paweł Hajdan Jr., 2015/07/24 09:44:17]

IsRemovableURL is located far from this method which makes reading the code
harder.

How about just expanding the logic here, e.g.:

if (!origin_to_clear.IsSameOriginWith(download->GetURL()) &&
!origin_to_clear.unique())
  continue;

... ?

+        download->GetStartTime() >= remove_begin &&
         (remove_end.is_null() || download->GetStartTime() < remove_end) &&
         (download->GetState() != DownloadItem::IN_PROGRESS)) {
       // Erases the download from downloads_.
       download->Remove();
       count++;
     }
   }
   return count;
 }
 
 int DownloadManagerImpl::RemoveDownloads(base::Time remove_begin) {
-  return RemoveDownloadsBetween(remove_begin, base::Time());
+  return RemoveDownloadsBetween(url::Origin(), remove_begin, base::Time());
 }
 
 int DownloadManagerImpl::RemoveAllDownloads() {
   // The null times make the date range unbounded.
-  int num_deleted = RemoveDownloadsBetween(base::Time(), base::Time());
+  int num_deleted = RemoveDownloadsBetween(
+      url::Origin(), base::Time(), base::Time());
   RecordClearAllSize(num_deleted);
   return num_deleted;
 }
 
 void DownloadManagerImpl::DownloadUrl(
     scoped_ptr<DownloadUrlParameters> params) {
   if (params->post_id() >= 0) {
     // Check this here so that the traceback is more useful.
     DCHECK(params->prefer_cache());
     DCHECK_EQ("POST", params->method());
@@ skipping 110 matching lines @@
   if (delegate_)
     delegate_->OpenDownload(download);
 }
 
 void DownloadManagerImpl::ShowDownloadInShell(DownloadItemImpl* download) {
   if (delegate_)
     delegate_->ShowDownloadInShell(download);
 }
 
 }  // namespace content