Convert InfoBarService to use the new navigation callbacks.

chrome/browser/infobars/infobar_service.cc

 // Copyright (c) 2013 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/infobars/infobar_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #include "components/infobars/core/infobar.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/web_contents.h"
 #include "ui/base/page_transition_types.h"
 
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(InfoBarService);
 
 // static
 infobars::InfoBarDelegate::NavigationDetails
     InfoBarService::NavigationDetailsFromLoadCommittedDetails(
@@ skipping 58 matching lines @@
       content::Details<infobars::InfoBar::RemovedDetails>(&removed_details));
 }
 
 // InfoBarService::CreateConfirmInfoBar() is implemented in platform-specific
 // files.
 
 void InfoBarService::RenderProcessGone(base::TerminationStatus status) {
   RemoveAllInfoBars(true);
 }
 
-void InfoBarService::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::ReloadType reload_type) {
+void InfoBarService::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSamePage())
+    return;
+
   ignore_next_reload_ = false;
 }
 
 void InfoBarService::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   const bool ignore = ignore_next_reload_ &&
       ui::PageTransitionCoreTypeIs(load_details.entry->GetTransitionType(),
                                    ui::PAGE_TRANSITION_RELOAD);
   ignore_next_reload_ = false;
   if (!ignore)
@@ skipping 14 matching lines @@
   // A normal user click on an infobar URL will result in a CURRENT_TAB
   // disposition; turn that into a NEW_FOREGROUND_TAB so that we don't end up
   // smashing the page the user is looking at.
   web_contents()->OpenURL(
       content::OpenURLParams(url, content::Referrer(),
                              (disposition == WindowOpenDisposition::CURRENT_TAB)
                                  ? WindowOpenDisposition::NEW_FOREGROUND_TAB
                                  : disposition,
                              ui::PAGE_TRANSITION_LINK, false));
 }