Clean up activity log URLs when history is cleaned.

chrome/browser/extensions/api/history/history_api.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/extensions/api/history/history_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/extensions/api/experimental_history.h"
 #include "chrome/common/extensions/api/history.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace extensions {
 
 using api::experimental_history::MostVisitedItem;
 using api::history::HistoryItem;
 using api::history::VisitItem;
+using extensions::ActivityLog;
 
 typedef std::vector<linked_ptr<api::history::HistoryItem> >
     HistoryItemList;
 typedef std::vector<linked_ptr<api::history::VisitItem> >
     VisitItemList;
 
 namespace AddUrl = api::history::AddUrl;
 namespace DeleteUrl = api::history::DeleteUrl;
 namespace DeleteRange = api::history::DeleteRange;
 namespace GetMostVisited = api::experimental_history::GetMostVisited;
@@ skipping 388 matching lines @@
 
   GURL url;
   if (!ValidateUrl(params->details.url, &url))
     return false;
 
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile(),
                                            Profile::EXPLICIT_ACCESS);
   hs->DeleteURL(url);
 
+  // Also clean out from the activity log.

[felt, 2013/09/03 23:03:46]

the activity log api needed to declare its dependency with
DeclareFactoryDependencies:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ext...

but I noticed that this API doesn't even do that for the HistoryService. so...
maybe you don't need to here? but you should keep an eye out for problems in the
browser tests if you remove the if.

+  ActivityLog* activity_log = ActivityLog::GetInstance(profile_);
+  if (activity_log) {
+    activity_log->RemoveURL(url);
+  }
+
   SendResponse(true);
   return true;
 }
 
 bool HistoryDeleteRangeFunction::RunAsyncImpl() {
   scoped_ptr<DeleteRange::Params> params(DeleteRange::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (!VerifyDeleteAllowed())
     return false;
 
   base::Time start_time = GetTime(params->range.start_time);
   base::Time end_time = GetTime(params->range.end_time);
 
   std::set<GURL> restrict_urls;
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile(),
                                            Profile::EXPLICIT_ACCESS);
   hs->ExpireHistoryBetween(
       restrict_urls,
       start_time,
       end_time,
       base::Bind(&HistoryDeleteRangeFunction::DeleteComplete,
                  base::Unretained(this)),
       &task_tracker_);
 
+  // Also clean from the activity log.
+  ActivityLog* activity_log = ActivityLog::GetInstance(profile());
+  if (activity_log) {
+    activity_log->RemoveURLs(restrict_urls);
+  }
+
   return true;
 }
 
 void HistoryDeleteRangeFunction::DeleteComplete() {
   SendAsyncResponse();
 }
 
 bool HistoryDeleteAllFunction::RunAsyncImpl() {
   if (!VerifyDeleteAllowed())
     return false;
 
   std::set<GURL> restrict_urls;
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile(),
                                            Profile::EXPLICIT_ACCESS);
   hs->ExpireHistoryBetween(
       restrict_urls,
       base::Time(),      // Unbounded beginning...
       base::Time(),      // ...and the end.
       base::Bind(&HistoryDeleteAllFunction::DeleteComplete,
                  base::Unretained(this)),
       &task_tracker_);
 
+  // Also clean up from the activity log.
+  ActivityLog* activity_log = ActivityLog::GetInstance(profile());
+  if (activity_log) {
+    activity_log->RemoveURLs(restrict_urls);
+  }
   return true;
 }
 
 void HistoryDeleteAllFunction::DeleteComplete() {
   SendAsyncResponse();
 }
 
 }  // namespace extensions