Move the ShortcutsBackend from history to autocomplete so that it can fully

chrome/browser/ui/omnibox/omnibox_navigation_observer.h

 // Copyright 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_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_
 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-namespace history {
 class ShortcutsBackend;
-}
 
 namespace net {
 class URLFetcher;
 class URLRequestStatus;
 }
 
 // Monitors omnibox navigations in order to trigger behaviors that depend on
 // successful navigations.
 //
 // Currently two such behaviors exist:
@@ skipping 59 matching lines @@
   // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Once the load has committed and any URL fetch has completed, this displays
   // the alternate nav infobar if necessary, and deletes |this|.
   void OnAllLoadingFinished();
 
   const base::string16 text_;
   const AutocompleteMatch match_;
   const AutocompleteMatch alternate_nav_match_;
-  scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;  // May be NULL
-                                                                // in incognito.
+  scoped_refptr<ShortcutsBackend> shortcuts_backend_;  // May be NULL in

[Anuj, 2014/03/15 00:51:05]

May be? I think it should be NULL in incognito.

[Peter Kasting, 2014/03/17 18:36:44]

Done.

+                                                       // incognito.
   scoped_ptr<net::URLFetcher> fetcher_;
   LoadState load_state_;
   FetchState fetch_state_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxNavigationObserver);
 };
 
 #endif  // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_