Pass the AlternateNavInfoBarDelegate an AutocompleteMatch instead of a GURL.

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"
-#include "url/gurl.h"
 
 namespace history {
 class ShortcutsBackend;
 }
 
 namespace net {
 class URLFetcher;
 class URLRequestStatus;
 }
 
@@ skipping 22 matching lines @@
  public:
   enum LoadState {
     LOAD_NOT_SEEN,
     LOAD_PENDING,
     LOAD_COMMITTED,
   };
 
   OmniboxNavigationObserver(Profile* profile,
                             const string16& text,
                             const AutocompleteMatch& match,
-                            const GURL& alternate_nav_url);
+                            const AutocompleteMatch& alternate_nav_match);
   virtual ~OmniboxNavigationObserver();
 
   LoadState load_state() const { return load_state_; }
 
   // Called directly by OmniboxEditModel when an extension-related navigation
   // occurs.  Such navigations don't trigger an immediate NAV_ENTRY_PENDING and
   // must be handled separately.
   void OnSuccessfulNavigation();
 
  private:
@@ skipping 19 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 string16 text_;
   const AutocompleteMatch match_;
-  const GURL alternate_nav_url_;
+  const AutocompleteMatch alternate_nav_match_;
   scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;  // May be NULL
                                                                 // in 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_