Remove NOTIFICATION_HISTORY_URLS_DELETED

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/command_line.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/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"

[sdefresne, 2014/12/04 17:21:12]

This include can also be removed ;-)

[nshaik, 2014/12/07 09:34:49]

:) Done

 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/history.h"
 #include "chrome/common/pref_names.h"
 #include "components/history/core/browser/history_types.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 
 namespace extensions {
 
 using api::history::HistoryItem;
 using api::history::VisitItem;
 using extensions::ActivityLog;
 
@@ skipping 86 matching lines @@
 
   return visit_item.Pass();
 }
 
 }  // namespace
 
 HistoryEventRouter::HistoryEventRouter(Profile* profile,
                                        HistoryService* history_service)
     : profile_(profile), history_service_observer_(this) {
   DCHECK(profile);
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                 content::Source<Profile>(profile));
   history_service_observer_.Add(history_service);
 }
 
 HistoryEventRouter::~HistoryEventRouter() {
 }
 
-void HistoryEventRouter::Observe(int type,
-                                 const content::NotificationSource& source,
-                                 const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_HISTORY_URLS_DELETED);
-  HistoryUrlsRemoved(
-      content::Source<Profile>(source).ptr(),
-      content::Details<const history::URLsDeletedDetails>(details).ptr());
-}
-
 void HistoryEventRouter::OnURLVisited(HistoryService* history_service,
                                       ui::PageTransition transition,
                                       const history::URLRow& row,
                                       const history::RedirectList& redirects,
                                       base::Time visit_time) {
   scoped_ptr<HistoryItem> history_item = GetHistoryItem(row);
   scoped_ptr<base::ListValue> args = OnVisited::Create(*history_item);
   DispatchEvent(profile_, api::history::OnVisited::kEventName, args.Pass());
 }
 
+void HistoryEventRouter::OnURLsDeleted(
+    HistoryService* history_service,
+    const history::URLsDeletedDetails& deleted_details) {
+  HistoryUrlsRemoved(history_service->profile(), &deleted_details);

[sdefresne, 2014/12/04 17:21:12]

Remove HistoryUrlsRemoved() method and inline the body there.

Use profile_ instead of history_service->profile() and remove the friend
declaration in HistoryService. If you want to be sure this is the correct
profile, you can add a DCHECK:

DCHECK_EQ(HistoryServiceFactory::GetForProfileIfExists(profile_,
Profile::EXPLICIT_ACCESS), profile_);

[nshaik, 2014/12/07 09:34:49]

Done.

+}
+
 void HistoryEventRouter::HistoryUrlsRemoved(
     Profile* profile,
     const history::URLsDeletedDetails* details) {
   OnVisitRemoved::Removed removed;
   removed.all_history = details->all_history;
 
   std::vector<std::string>* urls = new std::vector<std::string>();
   for (history::URLRows::const_iterator iterator = details->rows.begin();
       iterator != details->rows.end(); ++iterator) {
     urls->push_back(iterator->url().spec());
@@ skipping 293 matching lines @@
   }
 
   return true;
 }
 
 void HistoryDeleteAllFunction::DeleteComplete() {
   SendAsyncResponse();
 }
 
 }  // namespace extensions