Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/predictors/autocomplete_action_predictor.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/predictors/autocomplete_action_predictor.h"
 
 #include <math.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.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/omnibox/omnibox_log.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/predictors/predictor_database.h"
 #include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
@@ skipping 88 matching lines @@
       std::find(transitional_matches_.begin(), transitional_matches_.end(),
                 lower_user_text);
 
   if (match_it == transitional_matches_.end()) {
     TransitionalMatch transitional_match;
     transitional_match.user_text = lower_user_text;
     match_it = transitional_matches_.insert(transitional_matches_.end(),
                                             transitional_match);
   }
 
-  for (AutocompleteResult::const_iterator i(result.begin()); i != result.end();
-       ++i) {
+  for (const auto& i : result) {
     if (std::find(match_it->urls.begin(), match_it->urls.end(),
-                  i->destination_url) == match_it->urls.end()) {
-      match_it->urls.push_back(i->destination_url);
+                  i.destination_url) == match_it->urls.end()) {
+      match_it->urls.push_back(i.destination_url);
     }
   }
 }
 
 void AutocompleteActionPredictor::ClearTransitionalMatches() {
   transitional_matches_.clear();
 }
 
 void AutocompleteActionPredictor::CancelPrerender() {
   // If the prerender has already been abandoned, leave it to its own timeout;
@@ skipping 86 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
       CreateLocalCachesFromDatabase();
       notification_registrar_.Remove(
           this,
           content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
           content::NotificationService::AllSources());
       break;
-
-    case chrome::NOTIFICATION_HISTORY_URLS_DELETED: {
-      DCHECK(initialized_);
-      const content::Details<const history::URLsDeletedDetails>
-          urls_deleted_details =
-              content::Details<const history::URLsDeletedDetails>(details);
-      if (urls_deleted_details->all_history)
-        DeleteAllRows();
-      else
-        DeleteRowsWithURLs(urls_deleted_details->rows);
-      break;
-    }
-
     case chrome::NOTIFICATION_OMNIBOX_OPENED_URL: {
       DCHECK(initialized_);
 
       // TODO(dominich): This doesn't need to be synchronous. Investigate
       // posting it as a task to be run later.
       OnOmniboxOpenedUrl(*content::Details<OmniboxLog>(details).ptr());
       break;
     }
 
     default:
@@ skipping 293 matching lines @@
 void AutocompleteActionPredictor::FinishInitialization() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!initialized_);
 
   // Incognito and normal profiles should listen only to omnibox notifications
   // from their own profile, but both should listen to history deletions from
   // the main profile, since opening the history page in either case actually
   // opens the non-incognito history (and lets users delete from there).
   notification_registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                               content::Source<Profile>(profile_));
-  notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-      content::Source<Profile>(profile_->GetOriginalProfile()));
   initialized_ = true;
 }
 
 double AutocompleteActionPredictor::CalculateConfidence(
     const base::string16& user_text,
     const AutocompleteMatch& match,
     bool* is_in_db) const {
   const DBCacheKey key = { user_text, match.destination_url };
 
   *is_in_db = false;
@@ skipping 15 matching lines @@
     return 0.0;
 
   const double number_of_hits = static_cast<double>(value.number_of_hits);
   return number_of_hits / (number_of_hits + value.number_of_misses);
 }
 
 void AutocompleteActionPredictor::Shutdown() {
   history_service_observer_.RemoveAll();
 }
 
+void AutocompleteActionPredictor::OnURLsDeleted(
+    HistoryService* history_service,
+    bool all_history,
+    bool expired,
+    const history::URLRows& deleted_rows,
+    const std::set<GURL>& favicon_urls) {
+  DCHECK(initialized_);

[sky, 2014/12/13 00:29:18]

It looks as though the observer is added in the constructor. How do you know
that initialized_ is a true when you get here?

[nshaik, 2014/12/13 01:49:21]

I wanted to replicate the exact behavior, but I agree in this case the
notification might come before the AutocompleteActionProvider is initialized.
I will return if the state is not intialized instead of DCHECKing.

[sky, 2014/12/15 23:05:43]

I'm not entirely sure that's true. Can you get a more local owner to review
these files to make sure initialization order is correct.

+  if (all_history)
+    DeleteAllRows();
+  else
+    DeleteRowsWithURLs(deleted_rows);
+}
+
 void AutocompleteActionPredictor::OnHistoryServiceLoaded(
     HistoryService* history_service) {
   TryDeleteOldEntries(history_service);
   history_service_observer_.Remove(history_service);
 }
 
 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() {
 }
 
 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() {
 }
 
 }  // namespace predictors