Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Side by Side Diff: ios/web/web_state/ui/crw_web_controller_unittest.mm

Issue 1357773002: WKWebView: Implemented recoverable SSL interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lock_coloring
Patch Set: Self review Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/web/web_state/ui/crw_web_controller.h" 5 #import "ios/web/web_state/ui/crw_web_controller.h"
6 6
7 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 #import <WebKit/WebKit.h> 8 #import <WebKit/WebKit.h>
9 9
10 #include "base/ios/ios_util.h" 10 #include "base/ios/ios_util.h"
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 didFailProvisionalNavigation:nil 902 didFailProvisionalNavigation:nil
903 withError:error]; 903 withError:error];
904 904
905 // Verify correctness of delegate's method arguments. 905 // Verify correctness of delegate's method arguments.
906 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid()); 906 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid());
907 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status); 907 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status);
908 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status); 908 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status);
909 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN, 909 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN,
910 [mockDelegate_ SSLStatus].security_style); 910 [mockDelegate_ SSLStatus].security_style);
911 EXPECT_FALSE([mockDelegate_ recoverable]); 911 EXPECT_FALSE([mockDelegate_ recoverable]);
912 EXPECT_FALSE([mockDelegate_ shouldContinueCallback]); 912 EXPECT_TRUE([mockDelegate_ shouldContinueCallback]);
913 } 913 }
914 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) 914 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW)
915 915
916 // None of the |CRWUIWebViewWebControllerTest| setup is needed; 916 // None of the |CRWUIWebViewWebControllerTest| setup is needed;
917 typedef web::WebTestWithUIWebViewWebController 917 typedef web::WebTestWithUIWebViewWebController
918 CRWUIWebControllerPageDialogsOpenPolicyTest; 918 CRWUIWebControllerPageDialogsOpenPolicyTest;
919 919
920 // None of the |CRWWKWebViewWebControllerTest| setup is needed; 920 // None of the |CRWWKWebViewWebControllerTest| setup is needed;
921 typedef web::WebTestWithWKWebViewWebController 921 typedef web::WebTestWithWKWebViewWebController
922 CRWWKWebControllerPageDialogsOpenPolicyTest; 922 CRWWKWebControllerPageDialogsOpenPolicyTest;
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1545 // https://bugs.webkit.org/show_bug.cgi?id=140203 1545 // https://bugs.webkit.org/show_bug.cgi?id=140203
1546 VLOG(1) << "Script has been flushed."; 1546 VLOG(1) << "Script has been flushed.";
1547 }]; 1547 }];
1548 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript 1548 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript
1549 // evaluation will not happen until TearDown, which deallocates 1549 // evaluation will not happen until TearDown, which deallocates
1550 // CRWWebController, which in its turn will deallocate WKWebView to create a 1550 // CRWWebController, which in its turn will deallocate WKWebView to create a
1551 // crashy condition. 1551 // crashy condition.
1552 }; 1552 };
1553 1553
1554 } // namespace 1554 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698