[ios] Cleaned up deprecated SSLError delegate method.

ios/web/web_state/ui/crw_web_controller.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/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 4488 matching lines @@
     [_delegate webControllerDidUpdateSSLStatusForCurrentNavigationItem:self];
   }
 }
 
 - (void)handleSSLCertError:(NSError*)error {
   CHECK(web::IsWKWebViewSSLCertError(error));
 
   net::SSLInfo info;
   web::GetSSLInfoFromWKWebViewSSLCertError(error, &info);
 
-  // TODO(crbug.com/602298): Remove |status| variable, once |presentSSLError:|
-  // callback is dropped.
-  web::SSLStatus status;
-  status.security_style = web::SECURITY_STYLE_AUTHENTICATION_BROKEN;
-  status.cert_status = info.cert_status;
   if (!info.cert) {
     // |info.cert| can be null if certChain in NSError is empty or can not be
     // parsed, in this case do not ask delegate if error should be allowed, it
     // should not be.
     [self handleLoadError:error inMainFrame:YES];
     return;
   }
 
-  status.cert_id = web::CertStore::GetInstance()->StoreCert(info.cert.get(),
-                                                            self.certGroupID);
+  web::CertStore::GetInstance()->StoreCert(info.cert.get(), self.certGroupID);
 
   // Retrieve verification results from _certVerificationErrors cache to avoid
   // unnecessary recalculations. Verification results are cached for the leaf
   // cert, because the cert chain in |didReceiveAuthenticationChallenge:| is
   // the OS constructed chain, while |chain| is the chain from the server.
   NSArray* chain = error.userInfo[web::kNSErrorPeerCertificateChainKey];
   NSURL* requestURL = error.userInfo[web::kNSErrorFailingURLKey];
   NSString* host = [requestURL host];
   scoped_refptr<net::X509Certificate> leafCert;
   BOOL recoverable = NO;
   if (chain.count && host.length) {
     // The complete cert chain may not be available, so the leaf cert is used
     // as a key to retrieve _certVerificationErrors, as well as for storing the
     // cert decision.
     leafCert = web::CreateCertFromChain(@[ chain.firstObject ]);
     if (leafCert) {
       auto error = _certVerificationErrors->Get(
           {leafCert, base::SysNSStringToUTF8(host)});
       bool cacheHit = error != _certVerificationErrors->end();
       if (cacheHit) {
         recoverable = error->second.is_recoverable;
-        status.cert_status = error->second.status;
         info.cert_status = error->second.status;
       }
       UMA_HISTOGRAM_BOOLEAN("WebController.CertVerificationErrorsCacheHit",
                             cacheHit);
     }
   }
 
   // Present SSL interstitial and inform everyone that the load is cancelled.
-  void (^proceedBlock)() = ^{
-    DCHECK(recoverable);
-    // The interstitial will be removed during reload.
-    [_certVerificationController allowCert:leafCert
-                                   forHost:host
-                                    status:status.cert_status];
-    [self loadCurrentURL];
-  };
-  // TODO(crbug.com/602298): Remove SSL error API from CRWWebDelegate.
-  if ([self.delegate respondsToSelector:@selector(presentSSLError:
-                                                     forSSLStatus:
-                                                      recoverable:
-                                                         callback:)]) {
-    [self.delegate presentSSLError:info
-                      forSSLStatus:status
-                       recoverable:recoverable
-                          callback:^(BOOL proceed) {
-                            if (proceed)
-                              proceedBlock();
-                          }];
-  } else {
-    web::GetWebClient()->AllowCertificateError(
-        self.webState, net::MapCertStatusToNetError(info.cert_status), info,
-        net::GURLWithNSURL(requestURL), recoverable,
-        base::BindBlock(^(bool proceed) {
-          if (proceed)
-            proceedBlock();
-        }));
-  }
+  web::GetWebClient()->AllowCertificateError(

[marq (ping after 24h), 2016/07/18 09:34:13]

nit: It's not clear what part of this call induces the interstitial to be
presented. (a method with six parameters is also a problem, but that's outside
of the scope of this CL). If this comment isn't accurate, and this isn't what
displays the cert error, it should be updated.

[Eugene But (OOO till 7-30), 2016/07/18 15:44:17]

Good point. Updated the comment to be more generic, as mentioning interstitials
is not actually helpful.

Concerning 6 parameters. As I mentioned before this method with 6 parameters
mirrors a content// method which has 10 parameters and we intentionally choose
to be as close to content API as possible.

+      self.webState, net::MapCertStatusToNetError(info.cert_status), info,
+      net::GURLWithNSURL(requestURL), recoverable,
+      base::BindBlock(^(bool proceed) {
+        if (proceed) {
+          DCHECK(recoverable);
+          // The interstitial will be removed during reload.
+          [_certVerificationController allowCert:leafCert
+                                         forHost:host
+                                          status:info.cert_status];
+          [self loadCurrentURL];
+        }
+      }));
 
   [self didUpdateSSLStatusForCurrentNavigationItem];
   [self loadCancelled];
 }
 
 - (void)ensureWebViewCreated {
   WKWebViewConfiguration* config =
       [self webViewConfigurationProvider].GetWebViewConfiguration();
   [self ensureWebViewCreatedWithConfiguration:config];
 }
@@ skipping 1069 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end