Eliminate NOTIFICATION_HISTORY_LOADED notification

chrome/browser/predictors/autocomplete_action_predictor.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREDICTORS_AUTOCOMPLETE_ACTION_PREDICTOR_H_
 #define CHROME_BROWSER_PREDICTORS_AUTOCOMPLETE_ACTION_PREDICTOR_H_
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_table.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 
 struct AutocompleteMatch;
 class AutocompleteResult;
 class HistoryService;
@@ skipping 28 matching lines @@
 // UI thread where it lives.  For incognito profiles, there is no table; the
 // local caches are copied from the main profile at creation and from there on
 // are the only thing used.
 //
 // This class can be accessed as a weak pointer so that it can safely use
 // PostTaskAndReply without fear of crashes if it is destroyed before the reply
 // triggers. This is necessary during initialization.
 class AutocompleteActionPredictor
     : public KeyedService,
       public content::NotificationObserver,
+      public history::HistoryServiceObserver,
       public base::SupportsWeakPtr<AutocompleteActionPredictor> {
  public:
   enum Action {
     ACTION_PRERENDER = 0,
     ACTION_PRECONNECT,
     ACTION_NONE,
     LAST_PREDICT_ACTION = ACTION_NONE
   };
 
   explicit AutocompleteActionPredictor(Profile* profile);
@@ skipping 31 matching lines @@
   void CancelPrerender();
 
   // Return true if the suggestion type warrants a TCP/IP preconnection.
   // i.e., it is now quite likely that the user will select the related domain.
   static bool IsPreconnectable(const AutocompleteMatch& match);
 
   // Returns true if there is an active Omnibox prerender and it has been
   // abandoned.
   bool IsPrerenderAbandonedForTesting();
 
+  // KeyedService:
+  void Shutdown() override;

[brettw, 2014/11/14 21:13:06]

I would usually make these private just so it's obviously not part of the
classes public API (even though since we don't have private inheritance other
classes can still theoretically call it).

[nshaik, 2014/11/15 07:04:15]

Done.

+
+  // history::HistoryServiceObserver:
+  void OnHistoryServiceLoaded(HistoryService* history_service) override;
+
  private:
   friend class AutocompleteActionPredictorTest;
   friend class ::PredictorsHandler;
 
   struct TransitionalMatch {
     TransitionalMatch();
     ~TransitionalMatch();
 
     base::string16 user_text;
     std::vector<GURL> urls;
@@ skipping 114 matching lines @@
   // accuracy.  This is cleared after every omnibox navigation.
   mutable std::vector<std::pair<GURL, double> > tracked_urls_;
 
   // Local caches of the data store.  For incognito-owned predictors this is the
   // only copy of the data.
   DBCacheMap db_cache_;
   DBIdCacheMap db_id_cache_;
 
   bool initialized_;
 
+  ScopedObserver<HistoryService, HistoryServiceObserver>
+      history_service_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(AutocompleteActionPredictor);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_AUTOCOMPLETE_ACTION_PREDICTOR_H_