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

Unified Diff: ios/web/net/crw_ssl_status_updater_unittest.mm

Issue 2933383002: [ObjC ARC] Converts ios/web:ios_web_net_unittests to ARC. (Closed)
Patch Set: import -> include Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ios/web/net/crw_ssl_status_updater_unittest.mm
diff --git a/ios/web/net/crw_ssl_status_updater_unittest.mm b/ios/web/net/crw_ssl_status_updater_unittest.mm
index 0beecd9503abfe711ed502decc72fab2ee0d8135..dc9d4878795d57b2cfd2da3de19d6987bee17c5b 100644
--- a/ios/web/net/crw_ssl_status_updater_unittest.mm
+++ b/ios/web/net/crw_ssl_status_updater_unittest.mm
@@ -4,6 +4,7 @@
#import "ios/web/net/crw_ssl_status_updater.h"
+#include "base/mac/foundation_util.h"
#include "base/mac/scoped_block.h"
#include "base/strings/sys_string_conversions.h"
#import "ios/web/navigation/crw_session_controller+private_constructors.h"
@@ -19,10 +20,14 @@
#include "third_party/ocmock/OCMock/OCMock.h"
#include "third_party/ocmock/gtest_support.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
// Mocks CRWSSLStatusUpdaterTestDataSource.
@interface CRWSSLStatusUpdaterTestDataSource
: NSObject<CRWSSLStatusUpdaterDataSource> {
- base::mac::ScopedBlock<StatusQueryHandler> _verificationCompletionHandler;
+ StatusQueryHandler _verificationCompletionHandler;
}
// Yes if |SSLStatusUpdater:querySSLStatusForTrust:host:completionHandler| was
@@ -44,7 +49,7 @@
- (void)finishVerificationWithCertStatus:(net::CertStatus)certStatus
securityStyle:(web::SecurityStyle)securityStyle {
- _verificationCompletionHandler.get()(securityStyle, certStatus);
+ _verificationCompletionHandler(securityStyle, certStatus);
}
#pragma mark CRWSSLStatusUpdaterDataSource
@@ -53,7 +58,7 @@
querySSLStatusForTrust:(base::ScopedCFTypeRef<SecTrustRef>)trust
host:(NSString*)host
completionHandler:(StatusQueryHandler)completionHandler {
- _verificationCompletionHandler.reset([completionHandler copy]);
+ _verificationCompletionHandler = [completionHandler copy];
}
@end
@@ -77,16 +82,16 @@ class CRWSSLStatusUpdaterTest : public web::WebTest {
void SetUp() override {
web::WebTest::SetUp();
- data_source_.reset([[CRWSSLStatusUpdaterTestDataSource alloc] init]);
- delegate_.reset([[OCMockObject
- mockForProtocol:@protocol(CRWSSLStatusUpdaterDelegate)] retain]);
+ data_source_ = [[CRWSSLStatusUpdaterTestDataSource alloc] init];
+ delegate_ =
+ [OCMockObject mockForProtocol:@protocol(CRWSSLStatusUpdaterDelegate)];
nav_manager_.reset(new NavigationManagerImpl());
nav_manager_->SetBrowserState(GetBrowserState());
- ssl_status_updater_.reset([[CRWSSLStatusUpdater alloc]
- initWithDataSource:data_source_
- navigationManager:nav_manager_.get()]);
+ ssl_status_updater_ =
+ [[CRWSSLStatusUpdater alloc] initWithDataSource:data_source_
+ navigationManager:nav_manager_.get()];
[ssl_status_updater_ setDelegate:delegate_];
// Create test cert chain.
@@ -97,7 +102,7 @@ class CRWSSLStatusUpdaterTest : public web::WebTest {
net::x509_util::CreateSecCertificateArrayForX509Certificate(
cert.get()));
ASSERT_TRUE(chain);
- trust_ = CreateServerTrustFromChain(static_cast<NSArray*>(chain.get()),
+ trust_ = CreateServerTrustFromChain(base::mac::CFToNSCast(chain.get()),
kHostName);
}
@@ -109,10 +114,10 @@ class CRWSSLStatusUpdaterTest : public web::WebTest {
// Returns autoreleased session controller with a single committed entry.
CRWSessionController* SessionControllerWithEntry(std::string item_url_spec) {
std::vector<std::unique_ptr<web::NavigationItem>> nav_items;
- base::scoped_nsobject<CRWSessionController> session_controller(
+ CRWSessionController* session_controller =
[[CRWSessionController alloc] initWithBrowserState:GetBrowserState()
navigationItems:std::move(nav_items)
- lastCommittedItemIndex:0]);
+ lastCommittedItemIndex:0];
[session_controller
addPendingItem:GURL(item_url_spec)
referrer:Referrer()
@@ -122,13 +127,13 @@ class CRWSSLStatusUpdaterTest : public web::WebTest {
INHERIT];
[session_controller commitPendingItem];
- return session_controller.autorelease();
+ return session_controller;
}
- base::scoped_nsobject<CRWSSLStatusUpdaterTestDataSource> data_source_;
- base::scoped_nsprotocol<id> delegate_;
+ CRWSSLStatusUpdaterTestDataSource* data_source_;
+ id delegate_;
std::unique_ptr<web::NavigationManagerImpl> nav_manager_;
- base::scoped_nsobject<CRWSSLStatusUpdater> ssl_status_updater_;
+ CRWSSLStatusUpdater* ssl_status_updater_;
base::ScopedCFTypeRef<SecTrustRef> trust_;
};
« no previous file with comments | « ios/web/net/crw_cert_verification_controller_unittest.mm ('k') | ios/web/net/request_group_util_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698