Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/autocomplete/shortcuts_backend.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/autocomplete/shortcuts_backend.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/shortcuts_database.h"
 #include "chrome/browser/omnibox/omnibox_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/omnibox/autocomplete_result.h"
@@ skipping 43 matching lines @@
 }
 
 }  // namespace
 
 
 // ShortcutsBackend -----------------------------------------------------------
 
 ShortcutsBackend::ShortcutsBackend(Profile* profile, bool suppress_db)
     : profile_(profile),
       current_state_(NOT_INITIALIZED),
-      no_db_access_(suppress_db) {
+      no_db_access_(suppress_db),
+      history_service_observer_(this) {
   if (!suppress_db) {
     db_ = new history::ShortcutsDatabase(
         profile->GetPath().Append(chrome::kShortcutsDatabaseName));
   }
   // |profile| can be NULL in tests.
   if (profile) {
 #if defined(ENABLE_EXTENSIONS)
     notification_registrar_.Add(
         this,
         extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
         content::Source<Profile>(profile));
 #endif
-    notification_registrar_.Add(
-        this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-        content::Source<Profile>(profile));
+    HistoryService* hs =
+        HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
+    if (hs)
+      history_service_observer_.Add(hs);
   }
 }
 
 bool ShortcutsBackend::Init() {
   if (current_state_ != NOT_INITIALIZED)
     return false;
 
   if (no_db_access_) {
     current_state_ = INITIALIZED;
     return true;
@@ skipping 59 matching lines @@
       StripMatchMarkers(normalized_match.contents_class),
       normalized_match.description,
       StripMatchMarkers(normalized_match.description_class),
       normalized_match.transition, match_type, normalized_match.keyword);
 }
 
 void ShortcutsBackend::ShutdownOnUIThread() {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   notification_registrar_.RemoveAll();
+  history_service_observer_.RemoveAll();
 }
 
 void ShortcutsBackend::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   if (!initialized())
     return;
 
 #if defined(ENABLE_EXTENSIONS)
   if (type == extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED) {

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

Same here, this is the only notification listened for, so use DCHECK:

DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED);

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

Done.

     // When an extension is unloaded, we want to remove any Shortcuts associated
     // with it.
     DeleteShortcutsWithURL(content::Details<extensions::UnloadedExtensionInfo>(
         details)->extension->url(), false);
     return;
   }
 #endif
-
-  DCHECK_EQ(chrome::NOTIFICATION_HISTORY_URLS_DELETED, type);
-  const history::URLsDeletedDetails* deleted_details =
-      content::Details<const history::URLsDeletedDetails>(details).ptr();
-  if (deleted_details->all_history) {
-    DeleteAllShortcuts();
-    return;
-  }
-
-  const history::URLRows& rows(deleted_details->rows);
-  history::ShortcutsDatabase::ShortcutIDs shortcut_ids;
-  for (GuidMap::const_iterator it(guid_map_.begin()); it != guid_map_.end();
-        ++it) {
-    if (std::find_if(
-        rows.begin(), rows.end(), history::URLRow::URLRowHasURL(
-            it->second->second.match_core.destination_url)) != rows.end())
-      shortcut_ids.push_back(it->first);
-  }
-  DeleteShortcutsWithIDs(shortcut_ids);
 }
 
 void ShortcutsBackend::InitInternal() {
   DCHECK(current_state_ == INITIALIZING);
   db_->Init();
   history::ShortcutsDatabase::GuidToShortcutMap shortcuts;
   db_->LoadShortcuts(&shortcuts);
   temp_shortcuts_map_.reset(new ShortcutMap);
   temp_guid_map_.reset(new GuidMap);
   for (history::ShortcutsDatabase::GuidToShortcutMap::const_iterator it(
@@ skipping 105 matching lines @@
   guid_map_.clear();
   FOR_EACH_OBSERVER(ShortcutsBackendObserver, observer_list_,
                     OnShortcutsChanged());
   return no_db_access_ ||
       BrowserThread::PostTask(
           BrowserThread::DB, FROM_HERE,
           base::Bind(base::IgnoreResult(
                          &history::ShortcutsDatabase::DeleteAllShortcuts),
                      db_.get()));
 }
+
+void ShortcutsBackend::OnURLsDeleted(
+    HistoryService* history_service,
+    const history::URLsDeletedDetails& deleted_details) {
+  if (!initialized())
+    return;
+  if (deleted_details.all_history) {
+    DeleteAllShortcuts();
+    return;
+  }
+
+  const history::URLRows& rows(deleted_details.rows);
+  history::ShortcutsDatabase::ShortcutIDs shortcut_ids;
+  for (GuidMap::const_iterator it(guid_map_.begin()); it != guid_map_.end();

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

nit: c++11 for-loop and auto are now allowed, so this can be rewritten into

for (const auto& guid_pair : guid_map_) {
  if (std::find_if(row.begin(), rows.end(),
                   history::URLRow::URLRowHasURL(
                       guid_pair.second.second.match_core.destination_url)) !=
      rows.end()) {
    shortcut_ids.push_back(guid_pair.first);
  }
}

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

Done.

+       ++it) {
+    if (std::find_if(rows.begin(), rows.end(),
+                     history::URLRow::URLRowHasURL(
+                         it->second->second.match_core.destination_url)) !=
+        rows.end())
+      shortcut_ids.push_back(it->first);
+  }
+  DeleteShortcutsWithIDs(shortcut_ids);
+}