Moved ios popup opening code from Tab to BlockedPopupTabHelper.

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 353 matching lines @@
 // Handles exportable files if possible.
 - (void)handleExportableFile:(net::HttpResponseHeaders*)headers;
 
 // Called after the session history is replaced, useful for updating members
 // with new sessionID.
 - (void)didReplaceSessionHistory;
 
 // Called when the UIApplication's state becomes active.
 - (void)applicationDidBecomeActive;
 
-// Blocks popup for page with |popupURL|, requested by the page with
-// |openerURL|.
-- (void)blockPopupForURL:(const GURL&)popupURL openerURL:(const GURL&)openerURL;
-
 @end
 
 namespace {
 // TabHistoryContext is used by history to scope the lifetime of navigation
 // entry references to Tab.
 class TabHistoryContext : public history::Context {
  public:
   TabHistoryContext() {}
   ~TabHistoryContext() {}
 
@@ skipping 1078 matching lines @@
   if (requireReloadAfterBecomingActive_) {
     if (visible_) {
       [self.webController reload];
     } else {
       [self.webController requirePageReload];
     }
     requireReloadAfterBecomingActive_ = NO;
   }
 }
 
-- (void)blockPopupForURL:(const GURL&)popupURL
-               openerURL:(const GURL&)openerURL {
-  web::NavigationItem* item = [self navigationManager]->GetLastCommittedItem();
-  web::Referrer referrer(openerURL, item->GetReferrer().policy);
-  GURL localPopupURL(popupURL);
-  base::WeakNSObject<Tab> weakSelf(self);
-  // TODO(crbug.com/692117): Remove |window_name| from constructor.
-  web::BlockedPopupInfo poupInfo(popupURL, referrer, nil /* window_name */, ^{
-    web::WebState* webState = [weakSelf webState];
-    if (webState) {
-      web::WebState::OpenURLParams params(
-          localPopupURL, referrer, WindowOpenDisposition::NEW_POPUP,
-          ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */);
-      params.url = localPopupURL;
-      params.referrer = referrer;
-      params.transition = ui::PAGE_TRANSITION_LINK;
-      webState->OpenURL(params);
-    }
-  });
-  BlockedPopupTabHelper::FromWebState(self.webState)->HandlePopup(poupInfo);
-}
-
 #pragma mark -
 #pragma mark FindInPageControllerDelegate
 
 - (void)willAdjustScrollPosition {
   // Skip the next attempt to correct the scroll offset for the toolbar height.
   // Used when programatically scrolling down the y offset.
   [fullScreenController_ shouldSkipNextScrollOffsetForHeader];
 }
 
 #pragma mark -
@@ skipping 470 matching lines @@
 
 - (void)webControllerDidSuppressDialog:(id)webController {
   DCHECK(isPrerenderTab_);
   [delegate_ discardPrerender];
 }
 
 - (CRWWebController*)webController:(CRWWebController*)webController
          createWebControllerForURL:(const GURL&)URL
                          openerURL:(const GURL&)openerURL
                    initiatedByUser:(BOOL)initiatedByUser {
+  // Check if requested web controller is a popup and block it if necessary.
   if (!initiatedByUser) {
-    auto helper = BlockedPopupTabHelper::FromWebState(webController.webState);
-    if (helper->ShouldBlockPopup(openerURL)) {
-      [self blockPopupForURL:URL openerURL:openerURL];
+    web::WebState* webState = webController.webState;
+    auto blockedPopupTabHelper = BlockedPopupTabHelper::FromWebState(webState);
+    if (blockedPopupTabHelper->ShouldBlockPopup(openerURL)) {
+      web::NavigationItem* item =
+          webState->GetNavigationManager()->GetLastCommittedItem();
+      web::Referrer referrer(openerURL, item->GetReferrer().policy);
+      web::BlockedPopupInfo poupInfo(URL, referrer);
+      blockedPopupTabHelper->HandlePopup(poupInfo);
       return nil;
     }
   }
 
+  // Requested web controller should not be blocked from opening.
   [self updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
   Tab* tab = [parentTabModel_
       insertBlankTabWithTransition:ui::PAGE_TRANSITION_LINK
                             opener:self
                        openedByDOM:YES
                            atIndex:TabModelConstants::kTabPositionAutomatically
                       inBackground:NO];
   return tab.webController;
 }
 
@@ skipping 200 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end