[ios] Refactored dialogs suppression.

ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

 // Copyright 2014 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/web/web_state/ui/crw_wk_web_view_web_controller.h"
 
 #import <WebKit/WebKit.h>
 #include <stddef.h>
 
 #include <utility>
@@ skipping 439 matching lines @@
 - (void)evaluateUserJavaScript:(NSString*)script {
   [self setUserInteractionRegistered:YES];
   web::EvaluateJavaScript(_wkWebView, script, nil);
 }
 
 - (void)terminateNetworkActivity {
   web::CertStore::GetInstance()->RemoveCertsForGroup(self.certGroupID);
   [super terminateNetworkActivity];
 }
 
-- (void)setPageDialogOpenPolicy:(web::PageDialogOpenPolicy)policy {
-  // TODO(eugenebut): implement dialogs/windows suppression using
-  // WKNavigationDelegate methods where possible.
-  [super setPageDialogOpenPolicy:policy];
-}
-
 - (void)close {
   [_certVerificationController shutDown];
   [super close];
 }
 
 - (void)stopLoading {
   _stoppedWKNavigation.reset(_latestWKNavigation);
   [super stopLoading];
 }
 
@@ skipping 214 matching lines @@
 - (void)abortWebLoad {
   [_wkWebView stopLoading];
   [_pendingNavigationInfo setCancelled:YES];
   _certVerificationErrors->Clear();
 }
 
 - (void)resetLoadState {
   // Nothing to do.
 }
 
-- (void)setSuppressDialogsWithHelperScript:(NSString*)script {
-  [self evaluateJavaScript:script stringResultHandler:nil];
-}
-
 - (void)applyWebViewScrollZoomScaleFromZoomState:
     (const web::PageZoomState&)zoomState {
   // After rendering a web page, WKWebView keeps the |minimumZoomScale| and
   // |maximumZoomScale| properties of its scroll view constant while adjusting
   // the |zoomScale| property accordingly.  The maximum-scale or minimum-scale
   // meta tags of a page may have changed since the state was recorded, so clamp
   // the zoom scale to the current range if necessary.
   DCHECK(zoomState.IsValid());
   // Legacy-format scroll states cannot be applied to WKWebViews.
   if (zoomState.IsLegacyFormat())
@@ skipping 494 matching lines @@
 - (void)handleHTTPAuthForChallenge:(NSURLAuthenticationChallenge*)challenge
                  completionHandler:
                      (void (^)(NSURLSessionAuthChallengeDisposition,
                                NSURLCredential*))completionHandler {
   NSURLProtectionSpace* space = challenge.protectionSpace;
   DCHECK(
       [space.authenticationMethod isEqual:NSURLAuthenticationMethodHTTPBasic] ||
       [space.authenticationMethod isEqual:NSURLAuthenticationMethodNTLM] ||
       [space.authenticationMethod isEqual:NSURLAuthenticationMethodHTTPDigest]);
 
+  if (self.suppressDialogs) {
+    [self didSuppressDialog];
+    completionHandler(NSURLSessionAuthChallengeRejectProtectionSpace, nil);
+    return;
+  }
+
   SEL selector = @selector(webController:
          runAuthDialogForProtectionSpace:
                       proposedCredential:
                        completionHandler:);
   if (![self.UIDelegate respondsToSelector:selector]) {
     // Embedder does not support HTTP Authentication.
     completionHandler(NSURLSessionAuthChallengeRejectProtectionSpace, nil);
     return;
   }
 
@@ skipping 746 matching lines @@
   _certVerificationErrors->Clear();
   [self webViewWebProcessDidCrash];
 }
 
 #pragma mark WKUIDelegate Methods
 
 - (WKWebView*)webView:(WKWebView*)webView
     createWebViewWithConfiguration:(WKWebViewConfiguration*)configuration
                forNavigationAction:(WKNavigationAction*)navigationAction
                     windowFeatures:(WKWindowFeatures*)windowFeatures {
+  if (self.suppressDialogs) {
+    [self didSuppressDialog];
+    return nil;
+  }
+
   GURL requestURL = net::GURLWithNSURL(navigationAction.request.URL);
 
   if (![self userIsInteracting]) {
     NSString* referer = GetRefererFromNavigationAction(navigationAction);
     GURL referrerURL =
         referer ? GURL(base::SysNSStringToUTF8(referer)) : [self currentURL];
     if ([self shouldBlockPopupWithURL:requestURL sourceURL:referrerURL]) {
       [self didBlockPopupWithURL:requestURL sourceURL:referrerURL];
       // Desktop Chrome does not return a window for the blocked popups;
       // follow the same approach by returning nil;
@@ skipping 15 matching lines @@
 - (void)webViewDidClose:(WKWebView*)webView {
   if (self.sessionController.openedByDOM) {
     [self.delegate webPageOrderedClose];
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptAlertPanelWithMessage:(NSString*)message
                       initiatedByFrame:(WKFrameInfo*)frame
                      completionHandler:(void(^)())completionHandler {
+  if (self.suppressDialogs) {
+    [self didSuppressDialog];
+    completionHandler();
+    return;
+  }
+
   SEL alertSelector = @selector(webController:
            runJavaScriptAlertPanelWithMessage:
                                    requestURL:
                             completionHandler:);
   if ([self.UIDelegate respondsToSelector:alertSelector]) {
     [self.UIDelegate webController:self
         runJavaScriptAlertPanelWithMessage:message
                                 requestURL:net::GURLWithNSURL(frame.request.URL)
                          completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler();
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptConfirmPanelWithMessage:(NSString*)message
                         initiatedByFrame:(WKFrameInfo*)frame
                        completionHandler:
         (void (^)(BOOL result))completionHandler {
+  if (self.suppressDialogs) {
+    [self didSuppressDialog];
+    completionHandler(NO);
+    return;
+  }
+
   SEL confirmationSelector = @selector(webController:
                 runJavaScriptConfirmPanelWithMessage:
                                           requestURL:
                                    completionHandler:);
   if ([self.UIDelegate respondsToSelector:confirmationSelector]) {
     [self.UIDelegate webController:self
         runJavaScriptConfirmPanelWithMessage:message
                                   requestURL:
             net::GURLWithNSURL(frame.request.URL)
                            completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler(NO);
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptTextInputPanelWithPrompt:(NSString*)prompt
                               defaultText:(NSString*)defaultText
                          initiatedByFrame:(WKFrameInfo*)frame
                         completionHandler:
         (void (^)(NSString *result))completionHandler {
+  if (self.suppressDialogs) {
+    [self didSuppressDialog];
+    completionHandler(nil);
+    return;
+  }
+
   SEL textInputSelector = @selector(webController:
             runJavaScriptTextInputPanelWithPrompt:
                                       defaultText:
                                        requestURL:
                                 completionHandler:);
   if ([self.UIDelegate respondsToSelector:textInputSelector]) {
     GURL requestURL = net::GURLWithNSURL(frame.request.URL);
     [self.UIDelegate webController:self
         runJavaScriptTextInputPanelWithPrompt:prompt
                                   defaultText:defaultText
                                    requestURL:requestURL
                             completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler(nil);
   }
 }
 
 @end