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

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: Resolved Stuart's review comments 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 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 didFailProvisionalNavigation:nil 893 didFailProvisionalNavigation:nil
894 withError:error]; 894 withError:error];
895 895
896 // Verify correctness of delegate's method arguments. 896 // Verify correctness of delegate's method arguments.
897 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid()); 897 EXPECT_TRUE([mockDelegate_ SSLInfo].is_valid());
898 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status); 898 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLInfo].cert_status);
899 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status); 899 EXPECT_EQ(net::CERT_STATUS_INVALID, [mockDelegate_ SSLStatus].cert_status);
900 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN, 900 EXPECT_EQ(web::SECURITY_STYLE_AUTHENTICATION_BROKEN,
901 [mockDelegate_ SSLStatus].security_style); 901 [mockDelegate_ SSLStatus].security_style);
902 EXPECT_FALSE([mockDelegate_ recoverable]); 902 EXPECT_FALSE([mockDelegate_ recoverable]);
903 EXPECT_FALSE([mockDelegate_ shouldContinueCallback]); 903 EXPECT_TRUE([mockDelegate_ shouldContinueCallback]);
904 } 904 }
905 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW) 905 #endif // !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW)
906 906
907 // None of the |CRWUIWebViewWebControllerTest| setup is needed; 907 // None of the |CRWUIWebViewWebControllerTest| setup is needed;
908 typedef web::WebTestWithUIWebViewWebController 908 typedef web::WebTestWithUIWebViewWebController
909 CRWUIWebControllerPageDialogsOpenPolicyTest; 909 CRWUIWebControllerPageDialogsOpenPolicyTest;
910 910
911 // None of the |CRWWKWebViewWebControllerTest| setup is needed; 911 // None of the |CRWWKWebViewWebControllerTest| setup is needed;
912 typedef web::WebTestWithWKWebViewWebController 912 typedef web::WebTestWithWKWebViewWebController
913 CRWWKWebControllerPageDialogsOpenPolicyTest; 913 CRWWKWebControllerPageDialogsOpenPolicyTest;
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 // https://bugs.webkit.org/show_bug.cgi?id=140203 1536 // https://bugs.webkit.org/show_bug.cgi?id=140203
1537 VLOG(1) << "Script has been flushed."; 1537 VLOG(1) << "Script has been flushed.";
1538 }]; 1538 }];
1539 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript 1539 // -evaluateJavaScript:stringResultHandler: is asynchronous so JavaScript
1540 // evaluation will not happen until TearDown, which deallocates 1540 // evaluation will not happen until TearDown, which deallocates
1541 // CRWWebController, which in its turn will deallocate WKWebView to create a 1541 // CRWWebController, which in its turn will deallocate WKWebView to create a
1542 // crashy condition. 1542 // crashy condition.
1543 }; 1543 };
1544 1544
1545 } // namespace 1545 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698