[ios] Convert BlockedPopupHandler into a tab helper class.

ios/chrome/browser/tabs/tab.mm

 // 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.
 
 #import "ios/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 96 matching lines @@
 #import "ios/chrome/browser/ui/downloads/download_manager_controller.h"
 #import "ios/chrome/browser/ui/fullscreen_controller.h"
 #import "ios/chrome/browser/ui/open_in_controller.h"
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
 #import "ios/chrome/browser/ui/prerender_delegate.h"
 #import "ios/chrome/browser/ui/reader_mode/reader_mode_checker.h"
 #import "ios/chrome/browser/ui/reader_mode/reader_mode_controller.h"
 #import "ios/chrome/browser/ui/sad_tab/sad_tab_view.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/web/auto_reload_bridge.h"
-#import "ios/chrome/browser/web/blocked_popup_handler.h"
+#import "ios/chrome/browser/web/blocked_popup_tab_helper.h"
 #import "ios/chrome/browser/web/external_app_launcher.h"
 #include "ios/chrome/browser/web/network_activity_indicator_tab_helper.h"
 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
 #include "ios/chrome/browser/web/print_observer.h"
 #import "ios/chrome/browser/xcallback_parameters.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/native_app_metadata.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/native_app_whitelist_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
@@ skipping 64 matching lines @@
   // These two values are for when the app is in the foreground.
   FOREGROUND_TAB_FOREGROUND_APP = 0,
   BACKGROUND_TAB_FOREGROUND_APP,
   // These are for when the app is in the background.
   FOREGROUND_TAB_BACKGROUND_APP,
   BACKGROUND_TAB_BACKGROUND_APP,
   TERMINATION_TAB_STATE_COUNT
 };
 }  // namespace
 
-@interface Tab ()<BlockedPopupHandlerDelegate,
-                  CRWWebStateObserver,
+@interface Tab ()<CRWWebStateObserver,
                   CRWWebUserInterfaceDelegate,
                   FindInPageControllerDelegate,
                   ReaderModeControllerDelegate> {
   TabModel* parentTabModel_;               // weak
   ios::ChromeBrowserState* browserState_;  // weak
 
   base::scoped_nsobject<OpenInController> openInController_;
   base::WeakNSProtocol<id<PassKitDialogProvider>> passKitDialogProvider_;
   // TODO(crbug.com/546213): Move this out of Tab, probably to native app
   // launcher since that's the only thing that uses it.
@@ skipping 57 matching lines @@
       inputAccessoryViewController_;
 
   // TODO(crbug.com/661665): move the WebContentsObservers into their own
   // container.
   // Handles saving and autofill of passwords.
   base::scoped_nsobject<PasswordController> passwordController_;
 
   // Handles autofill.
   base::scoped_nsobject<AutofillController> autofillController_;
 
-  // The popup blocker to show blocked popup to the user.
-  std::unique_ptr<BlockedPopupHandler> popupHandler_;
-
   // Handles find on page.
   base::scoped_nsobject<FindInPageController> findInPageController_;
 
   // Handles GAL infobar on web pages.
   base::scoped_nsobject<NativeAppNavigationController>
       nativeAppNavigationController_;
 
   // Handles caching and retrieving of snapshots.
   base::scoped_nsobject<SnapshotManager> snapshotManager_;
 
@@ skipping 55 matching lines @@
 // Sets the favicon on the current NavigationItem.
 - (void)setFavicon:(const gfx::Image*)image;
 
 // Updates the title field of the current session entry. Also updates the
 // history database.
 - (void)updateTitle:(NSString*)title;
 
 // Saves the current title to the history database.
 - (void)saveTitleToHistoryDB;
 
-// Returns a lazily instantiated popup handler.
-- (BlockedPopupHandler*)popupHandler;
-
 // Adds the current session entry to this history database.
 - (void)addCurrentEntryToHistoryDB;
 
 // Adds any cached entries from |addPageVector_| to the history DB.
 - (void)commitCachedEntriesToHistoryDB;
 
 // Returns the OpenInController for this tab.
 - (OpenInController*)openInController;
 
 // Calls the model and ask to close this tab.
@@ skipping 181 matching lines @@
                             tab:self]);
 
     findInPageController_.reset([[FindInPageController alloc]
         initWithWebState:self.webState
                 delegate:self]);
 
     [self initNativeAppNavigationController];
     // IOSChromeSessionTabHelper comes first because it sets up the tab ID, and
     // other helpers may rely on that.
     IOSChromeSessionTabHelper::CreateForWebState(self.webState);
+
     NetworkActivityIndicatorTabHelper::CreateForWebState(self.webState,
                                                          self.tabId);
     IOSChromeSyncedTabDelegate::CreateForWebState(self.webState);
     InfoBarManagerImpl::CreateForWebState(self.webState);
     IOSSecurityStateTabHelper::CreateForWebState(self.webState);
     FormResubmissionTabHelper::CreateForWebState(self.webState);
+    BlockedPopupTabHelper::CreateForWebState(self.webState);
 
     if (reading_list::switches::IsReadingListEnabled()) {
       ReadingListModel* model =
           ReadingListModelFactory::GetForBrowserState(browserState_);
       ReadingListWebStateObserver::FromWebState(self.webState, model);
     }
 
     tabInfoBarObserver_.reset(new TabInfoBarObserver(self));
     tabInfoBarObserver_->SetShouldObserveInfoBarManager(true);
 
@@ skipping 1033 matching lines @@
 
 - (id<SnapshotOverlayProvider>)snapshotOverlayProvider {
   return snapshotOverlayProvider_.get();
 }
 
 - (void)setSnapshotOverlayProvider:
     (id<SnapshotOverlayProvider>)snapshotOverlayProvider {
   snapshotOverlayProvider_.reset(snapshotOverlayProvider);
 }
 
-- (BlockedPopupHandler*)popupHandler {
-  if (!popupHandler_.get()) {
-    popupHandler_.reset(new BlockedPopupHandler(self.browserState));
-    popupHandler_->SetDelegate(self);
-  }
-  return popupHandler_.get();
-}
-
 - (void)evaluateU2FResultFromURL:(const GURL&)URL {
   DCHECK(U2FController_);
   [U2FController_ evaluateU2FResultFromU2FURL:URL webState:self.webState];
 }
 
 #pragma mark - CRWWebDelegate and CRWWebStateObserver protocol methods.
 
 - (CRWWebController*)webPageOrderedOpen:(const GURL&)URL
                                referrer:(const web::Referrer&)referrer
                              windowName:(NSString*)windowName
@@ skipping 429 matching lines @@
   ContentSetting setting =
       ios::HostContentSettingsMapFactory::GetForBrowserState(browserState_)
           ->GetContentSetting(sourceURL, sourceURL,
                               CONTENT_SETTINGS_TYPE_POPUPS, std::string());
 
   return setting != CONTENT_SETTING_ALLOW;
 }
 
 - (void)webController:(CRWWebController*)webController
         didBlockPopup:(const web::BlockedPopupInfo&)blockedPopupInfo {
-  [self popupHandler]->HandlePopup(blockedPopupInfo);
+  BlockedPopupTabHelper::FromWebState(self.webState)
+      ->HandlePopup(blockedPopupInfo);
 }
 
 - (CGFloat)headerHeightForWebController:(CRWWebController*)webController {
   return [self.tabHeadersDelegate headerHeightForTab:self];
 }
 
 - (void)webControllerDidUpdateSSLStatusForCurrentNavigationItem:
     (CRWWebController*)webController {
   // Disable fullscreen if SSL cert is invalid.
   web::NavigationItem* item = [self navigationManager]->GetTransientItem();
@@ skipping 231 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end