Clean up activity log URLs when history is cleaned.

chrome/browser/browsing_data/browsing_data_remover.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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/nacl_host/nacl_browser.h"
 #include "chrome/browser/nacl_host/pnacl_host.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/password_manager/password_store.h"
@@ skipping 231 matching lines @@
       if (!remove_origin_.is_empty())
         restrict_urls.insert(remove_origin_);
       content::RecordAction(UserMetricsAction("ClearBrowsingData_History"));
       waiting_for_clear_history_ = true;
 
       history_service->ExpireLocalAndRemoteHistoryBetween(
           restrict_urls, delete_begin_, delete_end_,
           base::Bind(&BrowsingDataRemover::OnHistoryDeletionDone,
                      base::Unretained(this)),
           &history_task_tracker_);
+
+      // The extension activity contains details of which websites extensions
+      // were active on. It therefore indirectly stores details of websites a
+      // user has visited so best clean from here as well.
+      extensions::ActivityLog* activity_log =
+          extensions::ActivityLog::GetInstance(profile_);
+      if (activity_log) {

[Bernhard Bauer, 2013/09/03 21:55:42]

When is this NULL?

Also, nit: braces aren't required around single-line statements (and left out
for example above). So for consistency's sake I'd also leave them out here.

[karenlees, 2013/09/04 21:35:05]

Removed check. If it is not initialized before this code is called then it could
be NULL but discussing more with Adrienne it should be ok without the NULL check
in this file.

+        activity_log->RemoveURLs(restrict_urls);

[Matt Perry, 2013/09/03 22:16:23]

FYI, restrict_urls might be empty, in which case this will purge everything

[karenlees, 2013/09/04 21:35:05]

If the restrict URLs is empty the activity log method will clear all URLs, so it
should be consistent with how the history clearing is done.  If empty shouldn't
cause all URLs to be deleted from this part of the code I can add an if
condition here.  I wasn't sure what you meant by the comment. 

[Matt Perry, 2013/09/04 21:38:23]

Just making sure it was intended. Sounds like it was.

+      }
     }
 
     // Need to clear the host cache and accumulated speculative data, as it also
     // reveals some history: we have no mechanism to track when these items were
     // created, so we'll clear them all. Better safe than sorry.
     if (g_browser_process->io_thread()) {
       waiting_for_clear_hostname_resolution_cache_ = true;
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
@@ skipping 885 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_autofill_origin_urls_ = false;
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::OnClearWebRTCIdentityStore() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_webrtc_identity_store_ = false;
   NotifyAndDeleteIfDone();
 }