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

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2517233002: [ios] Removed SDK guards around |serverTrust| call in CRWWebController. (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index b35cdc7dcc06a5253881840741c74a8d56f0bce7..4b654cc2906c61d03cd012a9fa7d0575b4687308 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -4524,16 +4524,11 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
NSString* host = base::SysUTF8ToNSString(_documentURL.host());
BOOL hasOnlySecureContent = [_webView hasOnlySecureContent];
base::ScopedCFTypeRef<SecTrustRef> trust;
-// TODO(crbug.com/628696): Remove these guards after moving to iOS10 SDK.
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
if (base::ios::IsRunningOnIOS10OrLater()) {
trust.reset([_webView serverTrust], base::scoped_policy::RETAIN);
} else {
trust = web::CreateServerTrustFromChain([_webView certificateChain], host);
}
-#else
- trust = web::CreateServerTrustFromChain([_webView certificateChain], host);
-#endif
[_SSLStatusUpdater updateSSLStatusForNavigationItem:currentNavItem
withCertHost:host
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698