Convert ChromeOmniboxNavigationObserver to use the new navigation callbacks.

chrome/browser/ui/omnibox/chrome_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/chrome_omnibox_navigation_observer.h"
 
 #include "chrome/browser/autocomplete/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 "components/omnibox/browser/shortcuts_backend.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/navigation_handle.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/load_flags.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request.h"
 
@@ skipping 92 matching lines @@
                     content::NotificationService::AllSources());
   if (fetcher_) {
     fetcher_->SetRequestContext(
         content::BrowserContext::GetDefaultStoragePartition(
             controller->GetBrowserContext())->GetURLRequestContext());
   }
   WebContentsObserver::Observe(web_contents);
   // DidStartNavigationToPendingEntry() will be called for this load as well.
 }
 
-void ChromeOmniboxNavigationObserver::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::ReloadType reload_type) {
+void ChromeOmniboxNavigationObserver::DidStartNavigation(
+      content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSamePage())
+    return;
+
   if (load_state_ == LOAD_NOT_SEEN) {
     load_state_ = LOAD_PENDING;
     if (fetcher_)
       fetcher_->Start();
   } else {
     delete this;
   }
 }
 
-void ChromeOmniboxNavigationObserver::DidFailProvisionalLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description,
-    bool was_ignored_by_handler) {
-  if ((load_state_ != LOAD_COMMITTED) && !render_frame_host->GetParent())
+void ChromeOmniboxNavigationObserver::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if ((load_state_ != LOAD_COMMITTED) &&
+      navigation_handle->IsErrorPage() &&

[Peter Kasting, 2017/01/24 00:15:31]

Does IsErrorPage() mean the same thing that "failed the provisional load" used
to mean?  I'm worried about load failures that wouldn't result in error pages.

[jam, 2017/01/24 00:21:51]

Yep should be. A failing provisional load is equivalent to a navigation
finishing with an error.

[jam, 2017/01/24 00:22:26]

but if you have any test cases that aren't in existing tests, I'm happy to
manually test as well.

+      navigation_handle->IsInMainFrame() &&
+      !navigation_handle->IsSamePage())
     delete this;
 }
 
 void ChromeOmniboxNavigationObserver::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   load_state_ = LOAD_COMMITTED;
   if (ResponseCodeIndicatesSuccess(load_details.http_status_code) &&
       IsValidNavigation(match_.destination_url,
                         load_details.entry->GetVirtualURL()))
     OnSuccessfulNavigation();
@@ skipping 22 matching lines @@
     OnAllLoadingFinished();  // deletes |this|!
 }
 
 void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
   if (fetch_state_ == FETCH_SUCCEEDED) {
     AlternateNavInfoBarDelegate::Create(
         web_contents(), text_, alternate_nav_match_, match_.destination_url);
   }
   delete this;
 }