Convert PopupBlockerTabHelper to use the new navigation callbacks.

chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUP_BLOCKER_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUP_BLOCKER_TAB_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 35 matching lines @@
 
   // Creates the blocked popup with |popup_id|.
   void ShowBlockedPopup(int32_t popup_id);
 
   // Returns the number of blocked popups.
   size_t GetBlockedPopupsCount() const;
 
   PopupIdMap GetBlockedPopupRequests();
 
   // content::WebContentsObserver overrides:
-  void DidNavigateMainFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
 
  private:
   struct BlockedRequest;
   friend class content::WebContentsUserData<PopupBlockerTabHelper>;
 
   explicit PopupBlockerTabHelper(content::WebContents* web_contents);
 
   void AddBlockedPopup(const chrome::NavigateParams& params,
                        const blink::WebWindowFeatures& window_features);
 
   // Called when the blocked popup notification is shown or hidden.
   void PopupNotificationVisibilityChanged(bool visible);
 
   IDMap<std::unique_ptr<BlockedRequest>> blocked_popups_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupBlockerTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUP_BLOCKER_TAB_HELPER_H_