| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/net/crw_ssl_status_updater.h" | 5 #import "ios/web/net/crw_ssl_status_updater.h" |
| 6 | 6 |
| 7 #include "base/mac/scoped_block.h" | 7 #include "base/mac/scoped_block.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #import "ios/web/navigation/crw_session_controller+private_constructors.h" | 9 #import "ios/web/navigation/crw_session_controller+private_constructors.h" |
| 10 #import "ios/web/navigation/crw_session_controller.h" | 10 #import "ios/web/navigation/crw_session_controller.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 // Returns autoreleased session controller with a single committed entry. | 104 // Returns autoreleased session controller with a single committed entry. |
| 105 CRWSessionController* SessionControllerWithEntry(std::string item_url_spec) { | 105 CRWSessionController* SessionControllerWithEntry(std::string item_url_spec) { |
| 106 std::vector<std::unique_ptr<web::NavigationItem>> nav_items; | 106 std::vector<std::unique_ptr<web::NavigationItem>> nav_items; |
| 107 base::scoped_nsobject<CRWSessionController> session_controller( | 107 base::scoped_nsobject<CRWSessionController> session_controller( |
| 108 [[CRWSessionController alloc] | 108 [[CRWSessionController alloc] |
| 109 initWithNavigationItems:std::move(nav_items) | 109 initWithNavigationItems:std::move(nav_items) |
| 110 currentIndex:0 | 110 currentIndex:0 |
| 111 browserState:GetBrowserState()]); | 111 browserState:GetBrowserState()]); |
| 112 [session_controller addPendingItem:GURL(item_url_spec) | 112 [session_controller |
| 113 referrer:Referrer() | 113 addPendingItem:GURL(item_url_spec) |
| 114 transition:ui::PAGE_TRANSITION_LINK | 114 referrer:Referrer() |
| 115 rendererInitiated:NO]; | 115 transition:ui::PAGE_TRANSITION_LINK |
| 116 initiationType:web::NavigationInitiationType::USER_INITIATED]; |
| 116 [session_controller commitPendingItem]; | 117 [session_controller commitPendingItem]; |
| 117 | 118 |
| 118 return session_controller.autorelease(); | 119 return session_controller.autorelease(); |
| 119 } | 120 } |
| 120 | 121 |
| 121 base::scoped_nsobject<CRWSSLStatusUpdaterTestDataSource> data_source_; | 122 base::scoped_nsobject<CRWSSLStatusUpdaterTestDataSource> data_source_; |
| 122 base::scoped_nsprotocol<id> delegate_; | 123 base::scoped_nsprotocol<id> delegate_; |
| 123 std::unique_ptr<web::NavigationManagerImpl> nav_manager_; | 124 std::unique_ptr<web::NavigationManagerImpl> nav_manager_; |
| 124 base::scoped_nsobject<CRWSSLStatusUpdater> ssl_status_updater_; | 125 base::scoped_nsobject<CRWSSLStatusUpdater> ssl_status_updater_; |
| 125 base::ScopedCFTypeRef<SecTrustRef> trust_; | 126 base::ScopedCFTypeRef<SecTrustRef> trust_; |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 [data_source_ | 358 [data_source_ |
| 358 finishVerificationWithCertStatus:0 | 359 finishVerificationWithCertStatus:0 |
| 359 securityStyle:web::SECURITY_STYLE_AUTHENTICATED]; | 360 securityStyle:web::SECURITY_STYLE_AUTHENTICATED]; |
| 360 | 361 |
| 361 // Make sure that security style and content status did change. | 362 // Make sure that security style and content status did change. |
| 362 EXPECT_EQ(web::SECURITY_STYLE_UNKNOWN, item->GetSSL().security_style); | 363 EXPECT_EQ(web::SECURITY_STYLE_UNKNOWN, item->GetSSL().security_style); |
| 363 EXPECT_EQ(web::SSLStatus::NORMAL_CONTENT, item->GetSSL().content_status); | 364 EXPECT_EQ(web::SSLStatus::NORMAL_CONTENT, item->GetSSL().content_status); |
| 364 } | 365 } |
| 365 | 366 |
| 366 } // namespace web | 367 } // namespace web |
| OLD | NEW |