Make the OmniboxNavigationObserver update the ShortcutsProvider.

chrome/browser/ui/omnibox/omnibox_navigation_observer.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/ui/omnibox/omnibox_navigation_observer.h"
 
+#include "chrome/browser/history/shortcuts_backend.h"
+#include "chrome/browser/history/shortcuts_backend_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 25 matching lines @@
           final_url, redirect_url,
           net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace
 
 
 // OmniboxNavigationObserver --------------------------------------------------
 
 OmniboxNavigationObserver::OmniboxNavigationObserver(
+    Profile* profile,
+    const string16& text,
+    const AutocompleteMatch& match,
     const GURL& alternate_nav_url)
-    : alternate_nav_url_(alternate_nav_url),
+    : text_(text),
+      match_(match),
+      alternate_nav_url_(alternate_nav_url),
+      shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
       load_state_(LOAD_NOT_SEEN),
       fetch_state_(FETCH_NOT_COMPLETE) {
   if (alternate_nav_url_.is_valid()) {
     fetcher_.reset(net::URLFetcher::Create(alternate_nav_url,
                                            net::URLFetcher::HEAD, this));
     fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
     fetcher_->SetStopOnRedirect(true);
   }
   // We need to start by listening to AllSources, since we don't know which tab
   // the navigation might occur in.
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                  content::NotificationService::AllSources());
 }
 
 OmniboxNavigationObserver::~OmniboxNavigationObserver() {
 }
 
+void OmniboxNavigationObserver::OnSuccessfulNavigation() {
+  if (shortcuts_backend_)

[Bart N., 2013/10/16 17:42:47]

This looks odd. The only place where you assign shortcuts_backend_ is in the
constructor and my understanding is that
ShortcutsBackendFactory::GetForProfile(profile) may return NULL.

If so, would it be possible to avoid listening on successful notification if the
backend is NULL? What's the point otherwise?

+    shortcuts_backend_->OnOmniboxNavigation(text_, match_);
+}
+
 void OmniboxNavigationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_PENDING, type);
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                     content::NotificationService::AllSources());
   content::NavigationController* controller =
       content::Source<content::NavigationController>(source).ptr();
   if (fetcher_) {
     fetcher_->SetRequestContext(
         controller->GetBrowserContext()->GetRequestContext());
   }
   WebContentsObserver::Observe(controller->GetWebContents());
   // NavigateToPendingEntry() will be called for this load as well.
 }
 
 void OmniboxNavigationObserver::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   load_state_ = LOAD_COMMITTED;
+  if (ResponseCodeIndicatesSuccess(load_details.http_status_code) &&
+      IsValidNavigation(match_.destination_url, load_details.entry->GetURL()))
+    OnSuccessfulNavigation();
   if (!fetcher_ || (fetch_state_ != FETCH_NOT_COMPLETE))
     OnAllLoadingFinished();  // deletes |this|!
 }
 
 void OmniboxNavigationObserver::WebContentsDestroyed(
     content::WebContents* web_contents) {
   delete this;
 }
 
 void OmniboxNavigationObserver::NavigateToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   if (load_state_ == LOAD_NOT_SEEN) {
     load_state_ = LOAD_PENDING;
     if (fetcher_)
       fetcher_->Start();
   } else {
     delete this;
   }
 }
 
 void OmniboxNavigationObserver::OnURLFetchComplete(
     const net::URLFetcher* source) {
+  DCHECK_EQ(fetcher_.get(), source);
   const net::URLRequestStatus& status = source->GetStatus();
   int response_code = source->GetResponseCode();
   fetch_state_ =
       (status.is_success() && ResponseCodeIndicatesSuccess(response_code)) ||
       ((status.status() == net::URLRequestStatus::CANCELED) &&
        ((response_code / 100) == 3) &&
        IsValidNavigation(alternate_nav_url_, source->GetURL())) ?
           FETCH_SUCCEEDED : FETCH_FAILED;
   if (load_state_ == LOAD_COMMITTED)
     OnAllLoadingFinished();  // deletes |this|!
 }
 
 void OmniboxNavigationObserver::OnAllLoadingFinished() {
   if (fetch_state_ == FETCH_SUCCEEDED) {
     AlternateNavInfoBarDelegate::Create(
         InfoBarService::FromWebContents(web_contents()), alternate_nav_url_);
   }
   delete this;
 }