Reporting: Plumb from //chrome/browser/browsing_data.

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

 // Copyright 2016 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 "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
@@ skipping 56 matching lines @@
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/translate/core/browser/language_model.h"
 #include "components/web_cache/browser/web_cache_manager.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "content/public/browser/plugin_data_remover.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_transaction_factory.h"
+#include "net/reporting/reporting_browsing_data_remover.h"
+#include "net/reporting/reporting_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/url_util.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/webapps/webapp_registry.h"
 #include "chrome/browser/precache/precache_manager_factory.h"
 #include "components/offline_pages/core/offline_page_feature.h"
 #include "components/offline_pages/core/offline_page_model.h"
@@ skipping 142 matching lines @@
 
   net::HttpNetworkSession* http_session = context_getter->GetURLRequestContext()
                                               ->http_transaction_factory()
                                               ->GetSession();
   DCHECK(http_session);
   http_session->http_auth_cache()->ClearEntriesAddedWithin(base::Time::Now() -
                                                            delete_begin);
   http_session->CloseAllConnections();
 }
 
+void ClearReportingCacheOnIOThread(
+    net::URLRequestContextGetter* context,
+    int data_type_mask,
+    base::Callback<bool(const GURL&)> origin_filter) {

[Bernhard Bauer, 2017/04/21 16:49:26]

Nit: Callbacks are usually passed by const-ref.

[Julia Tuttle, 2017/04/21 18:25:11]

Oops!

+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  net::ReportingService* service =
+      context->GetURLRequestContext()->reporting_service();
+  if (service)
+    service->RemoveBrowsingData(data_type_mask, origin_filter);
+}
+
 // Returned by ChromeBrowsingDataRemoverDelegate::GetOriginTypeMatcher().
 bool DoesOriginMatchEmbedderMask(int origin_type_mask,
                                  const GURL& origin,
                                  storage::SpecialStoragePolicy* policy) {
   DCHECK_EQ(
       0,
       origin_type_mask &
           (ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_EMBEDDER_BEGIN - 1))
       << "|origin_type_mask| can only contain origin types defined in "
       << "the embedder.";
@@ skipping 70 matching lines @@
       clear_http_auth_cache_(sub_task_forward_callback_),
       clear_platform_keys_(sub_task_forward_callback_),
 #if defined(OS_ANDROID)
       clear_precache_history_(sub_task_forward_callback_),
       clear_offline_page_data_(sub_task_forward_callback_),
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
       clear_webrtc_logs_(sub_task_forward_callback_),
 #endif
       clear_auto_sign_in_(sub_task_forward_callback_),
+      clear_reporting_cache_(sub_task_forward_callback_),
 #if BUILDFLAG(ENABLE_PLUGINS)
       flash_lso_helper_(BrowsingDataFlashLSOHelper::Create(browser_context)),
 #endif
 #if defined(OS_ANDROID)
       webapp_registry_(new WebappRegistry()),
 #endif
       weak_ptr_factory_(this) {}
 
 ChromeBrowsingDataRemoverDelegate::~ChromeBrowsingDataRemoverDelegate() {
   history_task_tracker_.TryCancelAll();
@@ skipping 648 matching lines @@
         mode = domain_reliability::CLEAR_BEACONS;
 
       clear_domain_reliability_monitor_.Start();
       service->ClearBrowsingData(
           mode,
           filter,
           clear_domain_reliability_monitor_.GetCompletionCallback());
     }
   }
 
+  if ((remove_mask & BrowsingDataRemover::DATA_TYPE_COOKIES) ||
+      (remove_mask & DATA_TYPE_HISTORY)) {
+    scoped_refptr<net::URLRequestContextGetter> context =
+        profile_->GetRequestContext();
+
+    int data_type_mask = 0;
+    if (remove_mask & DATA_TYPE_HISTORY)
+      data_type_mask |= net::ReportingBrowsingDataRemover::DATA_TYPE_REPORTS;
+    if (remove_mask & BrowsingDataRemover::DATA_TYPE_COOKIES)
+      data_type_mask |= net::ReportingBrowsingDataRemover::DATA_TYPE_CLIENTS;
+
+    clear_reporting_cache_.Start();
+    BrowserThread::PostTaskAndReply(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&ClearReportingCacheOnIOThread,
+                   base::RetainedRef(std::move(context)), data_type_mask,
+                   filter),
+        UIThreadTrampoline(clear_reporting_cache_.GetCompletionCallback()));
+  }
+
 //////////////////////////////////////////////////////////////////////////////
 // DATA_TYPE_WEB_APP_DATA
 #if defined(OS_ANDROID)
   // Clear all data associated with registered webapps.
   if (remove_mask & DATA_TYPE_WEB_APP_DATA)
     webapp_registry_->UnregisterWebappsForUrls(filter);
 #endif
 
   //////////////////////////////////////////////////////////////////////////////
   // Remove external protocol data.
@@ skipping 29 matching lines @@
          !clear_http_auth_cache_.is_pending() &&
          !clear_platform_keys_.is_pending() &&
 #if defined(OS_ANDROID)
          !clear_precache_history_.is_pending() &&
          !clear_offline_page_data_.is_pending() &&
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
          !clear_webrtc_logs_.is_pending() &&
 #endif
          !clear_auto_sign_in_.is_pending() &&
-         !clear_plugin_data_count_;
+         !clear_reporting_cache_.is_pending() && !clear_plugin_data_count_;
 }
 
 #if defined(OS_ANDROID)
 void ChromeBrowsingDataRemoverDelegate::OverrideWebappRegistryForTesting(
     std::unique_ptr<WebappRegistry> webapp_registry) {
   webapp_registry_ = std::move(webapp_registry);
 }
 #endif
 
 #if BUILDFLAG(ENABLE_PLUGINS)
@@ skipping 75 matching lines @@
 }
 
 void ChromeBrowsingDataRemoverDelegate::
 OnDeauthorizeFlashContentLicensesCompleted(
     uint32_t request_id,
     bool /* success */) {
   DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_);
   clear_flash_content_licenses_.GetCompletionCallback().Run();
 }
 #endif