[ios] Cleaned up deprecated SSLError delegate method.

ios/web/web_state/ui/crw_web_controller_unittest.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>
 
 #include <utility>
 
@@ skipping 55 matching lines @@
 // sourceURL passed to webController:shouldBlockPopupWithURL:sourceURL:
 // Used for testing.
 @property(nonatomic, assign) GURL sourceURL;
 // Whether or not the delegate should block popups.
 @property(nonatomic, assign) BOOL blockPopups;
 // A web controller that will be returned by webPageOrdered... methods.
 @property(nonatomic, assign) CRWWebController* childWebController;
 // Blocked popup info received in |webController:didBlockPopup:| call.
 // nullptr if that delegate method was not called.
 @property(nonatomic, readonly) web::BlockedPopupInfo* blockedPopupInfo;
-// SSL info received in |presentSSLError:forSSLStatus:recoverable:callback:|
-// call.
-@property(nonatomic, readonly) net::SSLInfo SSLInfo;
-// SSL status received in |presentSSLError:forSSLStatus:recoverable:callback:|
-// call.
-@property(nonatomic, readonly) web::SSLStatus SSLStatus;
-// Recoverable flag received in
-// |presentSSLError:forSSLStatus:recoverable:callback:| call.
-@property(nonatomic, readonly) BOOL recoverable;
-// Callback received in |presentSSLError:forSSLStatus:recoverable:callback:|
-// call.
-@property(nonatomic, readonly) SSLErrorCallback shouldContinueCallback;
 @end
 
 // Stub implementation for CRWWebUserInterfaceDelegate protocol.
 @interface CRWWebUserInterfaceDelegateStub
     : OCMockComplexTypeHelper<CRWWebUserInterfaceDelegate>
 @end
 
 @implementation CRWWebUserInterfaceDelegateStub
 
 - (void)webController:(CRWWebController*)webController
@@ skipping 52 matching lines @@
 @end
 
 @implementation MockInteractionLoader {
   // Backs up the property with the same name.
   std::unique_ptr<web::BlockedPopupInfo> _blockedPopupInfo;
 }
 @synthesize popupURL = _popupURL;
 @synthesize sourceURL = _sourceURL;
 @synthesize blockPopups = _blockPopups;
 @synthesize childWebController = _childWebController;
-@synthesize SSLInfo = _SSLInfo;
-@synthesize SSLStatus = _SSLStatus;
-@synthesize recoverable = _recoverable;
-@synthesize shouldContinueCallback = _shouldContinueCallback;
 
 typedef void (^webPageOrderedOpenBlankBlockType)();
 typedef void (^webPageOrderedOpenBlockType)(const GURL&,
                                             const web::Referrer&,
                                             NSString*,
                                             BOOL);
 
 - (instancetype)initWithRepresentedObject:(id)representedObject {
   self = [super initWithRepresentedObject:representedObject];
   if (self) {
@@ skipping 33 matching lines @@
 
 - (void)webController:(CRWWebController*)webController
         didBlockPopup:(const web::BlockedPopupInfo&)blockedPopupInfo {
   _blockedPopupInfo.reset(new web::BlockedPopupInfo(blockedPopupInfo));
 }
 
 - (web::BlockedPopupInfo*)blockedPopupInfo {
   return _blockedPopupInfo.get();
 }
 
-- (void)presentSSLError:(const net::SSLInfo&)info
-           forSSLStatus:(const web::SSLStatus&)status
-            recoverable:(BOOL)recoverable
-               callback:(SSLErrorCallback)shouldContinue {
-  _SSLInfo = info;
-  _SSLStatus = status;
-  _recoverable = recoverable;
-  _shouldContinueCallback = shouldContinue;
-}
-
 @end
 
 @interface CountingObserver : NSObject<CRWWebControllerObserver>
 
 @property(nonatomic, readonly) int pageLoadedCount;
 @property(nonatomic, readonly) int messageCount;
 @end
 
 @implementation CountingObserver
 @synthesize pageLoadedCount = _pageLoadedCount;
@@ skipping 201 matching lines @@
         fromItem.SetURL(MAKE_URL(start));
         toItem.SetURL(MAKE_URL(end));
         EXPECT_EQ(MAKE_URL([end stringByAppendingString:@"#"]),
                   [web_controller() URLForHistoryNavigationFromItem:&fromItem
                                                              toItem:&toItem]);
       }
     }
   }
 }
 
-// Tests that presentSSLError:forSSLStatus:recoverable:callback: is called with
-// correct arguments if WKWebView fails to load a page with bad SSL cert.
-// TODO(crbug.com/602298): Remove this test.
-TEST_F(CRWWebControllerTest, SslCertErrorDeprecatedApi) {
-  ASSERT_FALSE([mockDelegate_ SSLInfo].is_valid());
-
-  scoped_refptr<net::X509Certificate> cert =
-      net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
-
-  NSArray* chain = @[ static_cast<id>(cert->os_cert_handle()) ];
-  NSError* error =
-      [NSError errorWithDomain:NSURLErrorDomain
-                          code:NSURLErrorServerCertificateHasUnknownRoot
-                      userInfo:@{
-                        web::kNSErrorPeerCertificateChainKey : chain,
-                      }];
-
-  CRWWebControllerContainerView* containerView =
-      static_cast<CRWWebControllerContainerView*>([web_controller() view]);
-  WKWebView* webView =
-      static_cast<WKWebView*>(containerView.webViewContentView.webView);
-  base::scoped_nsobject<NSObject> navigation([[NSObject alloc] init]);
-  [static_cast<id<WKNavigationDelegate>>(web_controller())
-                            webView:webView
-      didStartProvisionalNavigation:static_cast<WKNavigation*>(navigation)];
-  [static_cast<id<WKNavigationDelegate>>(web_controller())
-                           webView:webView
-      didFailProvisionalNavigation:static_cast<WKNavigation*>(navigation)
-                         withError:error];
-
-  // Verify correctness of delegate's method arguments.
-  EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid());
-  EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status);
-  EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status);
-  EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN,
-            [mockDelegate_ SSLStatus].security_style);
-  EXPECT_FALSE([mockDelegate_ recoverable]);
-  EXPECT_TRUE([mockDelegate_ shouldContinueCallback]);
-}
-
 // Tests that AllowCertificateError is called with correct arguments if
 // WKWebView fails to load a page with bad SSL cert.
 TEST_F(CRWWebControllerTest, SslCertError) {
-  // TODO(crbug.com/602298): Remove this call.
-  [web_controller() setDelegate:nil];
-
   // Last arguments passed to AllowCertificateError must be in default state.
   ASSERT_FALSE(GetWebClient()->last_cert_error_code());
   ASSERT_FALSE(GetWebClient()->last_cert_error_ssl_info().is_valid());
   ASSERT_FALSE(GetWebClient()->last_cert_error_ssl_info().cert_status);
   ASSERT_FALSE(GetWebClient()->last_cert_error_request_url().is_valid());
   ASSERT_TRUE(GetWebClient()->last_cert_error_overridable());
 
   scoped_refptr<net::X509Certificate> cert =
       net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
 
@@ skipping 567 matching lines @@
 
   [web_controller() setDelegate:delegate];
   web::SimulateWKWebViewCrash(webView_);
 
   EXPECT_OCMOCK_VERIFY(delegate);
   EXPECT_FALSE([web_controller() isViewAlive]);
   [web_controller() setDelegate:nil];
 };
 
 }  // namespace