Clean up activity log URLs when history is cleaned.

chrome/browser/browsing_data/browsing_data_remover.cc

Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 0512a67415d3fe4a8302cd10300c2d2d4f24f770..d7bb02763887681b14bf35949b5b0e25f41d668e 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -19,6 +19,7 @@
 #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"
@@ -270,6 +271,15 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
           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