Pass the AlternateNavInfoBarDelegate an AutocompleteMatch instead of a GURL.

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"
@@ skipping 36 matching lines @@
 
 }  // namespace
 
 
 // OmniboxNavigationObserver --------------------------------------------------
 
 OmniboxNavigationObserver::OmniboxNavigationObserver(
     Profile* profile,
     const string16& text,
     const AutocompleteMatch& match,
-    const GURL& alternate_nav_url)
+    const AutocompleteMatch& alternate_nav_match)
     : text_(text),
       match_(match),
-      alternate_nav_url_(alternate_nav_url),
+      alternate_nav_match_(alternate_nav_match),
       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,
+  if (alternate_nav_match_.destination_url.is_valid()) {
+    fetcher_.reset(net::URLFetcher::Create(alternate_nav_match_.destination_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());
 }
 
@@ skipping 51 matching lines @@
 
 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())) ?
+       IsValidNavigation(alternate_nav_match_.destination_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_);
+        InfoBarService::FromWebContents(web_contents()), alternate_nav_match_);
   }
   delete this;
 }