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

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: Addressed unit tests review comments Created 5 years, 1 month 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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 didFailProvisionalNavigation:nil 901 didFailProvisionalNavigation:nil
902 withError:error]; 902 withError:error];
903 903
904 // Verify correctness of delegate's method arguments. 904 // Verify correctness of delegate's method arguments.
905 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid()); 905 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid());
906 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status); 906 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status);
907 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status); 907 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status);
908 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN, 908 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN,
909 [mockDelegate_ SSLStatus].security_style); 909 [mockDelegate_ SSLStatus].security_style);
910 EXPECT_FALSE([mockDelegate_ recoverable]); 910 EXPECT_FALSE([mockDelegate_ recoverable]);
911 EXPECT_FALSE([mockDelegate_ shouldContinueCallback]); 911 EXPECT_TRUE([mockDelegate_ shouldContinueCallback]);
912 } 912 }
913 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) 913 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW)
914 914
915 // None of the |CRWUIWebViewWebControllerTest| setup is needed; 915 // None of the |CRWUIWebViewWebControllerTest| setup is needed;
916 typedef web::WebTestWithUIWebViewWebController 916 typedef web::WebTestWithUIWebViewWebController
917 CRWUIWebControllerPageDialogsOpenPolicyTest; 917 CRWUIWebControllerPageDialogsOpenPolicyTest;
918 918
919 // None of the |CRWWKWebViewWebControllerTest| setup is needed; 919 // None of the |CRWWKWebViewWebControllerTest| setup is needed;
920 typedef web::WebTestWithWKWebViewWebController 920 typedef web::WebTestWithWKWebViewWebController
921 CRWWKWebControllerPageDialogsOpenPolicyTest; 921 CRWWKWebControllerPageDialogsOpenPolicyTest;
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 // https://bugs.webkit.org/show_bug.cgi?id=140203 1544 // https://bugs.webkit.org/show_bug.cgi?id=140203
1545 VLOG(1) << "Script has been flushed."; 1545 VLOG(1) << "Script has been flushed.";
1546 }]; 1546 }];
1547 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript 1547 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript
1548 // evaluation will not happen until TearDown, which deallocates 1548 // evaluation will not happen until TearDown, which deallocates
1549 // CRWWebController, which in its turn will deallocate WKWebView to create a 1549 // CRWWebController, which in its turn will deallocate WKWebView to create a
1550 // crashy condition. 1550 // crashy condition.
1551 }; 1551 };
1552 1552
1553 } // namespace 1553 } // namespace
OLDNEW
« no previous file with comments | « ios/web/net/crw_cert_verification_controller_unittest.mm ('k') | ios/web/web_state/ui/crw_wk_web_view_web_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698