Convert iOS to use X509CertificateBytes.

ios/web/net/crw_cert_verification_controller_unittest.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/net/crw_cert_verification_controller.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/message_loop/message_loop.h"
 #import "base/test/ios/wait_util.h"
 #include "ios/web/public/test/web_test.h"
 #include "ios/web/public/web_thread.h"
 #import "ios/web/web_state/wk_web_view_security_util.h"
 #include "net/cert/x509_certificate.h"
+#include "net/cert/x509_util_ios_and_mac.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 
 namespace web {
 
 namespace {
 // Generated cert filename.
 const char kCertFileName[] = "ok_cert.pem";
 // Test hostname for cert verification.
 NSString* const kHostName = @"www.example.com";
 }  // namespace
 
 // Test fixture to test CRWCertVerificationController class.
 class CRWCertVerificationControllerTest : public web::WebTest {
  protected:
   void SetUp() override {
     web::WebTest::SetUp();
 
     controller_.reset([[CRWCertVerificationController alloc]
         initWithBrowserState:GetBrowserState()]);
     cert_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), kCertFileName);
     ASSERT_TRUE(cert_);
 
-    NSArray* chain = GetChain(cert_);
-    valid_trust_ = web::CreateServerTrustFromChain(chain, kHostName);
+    base::ScopedCFTypeRef<CFMutableArrayRef> chain(
+        net::x509_util::CreateSecCertificateArrayForX509Certificate(
+            cert_.get()));
+    ASSERT_TRUE(chain);
+    valid_trust_ = web::CreateServerTrustFromChain(
+        static_cast<NSArray*>(chain.get()), kHostName);
     web::EnsureFutureTrustEvaluationSucceeds(valid_trust_.get());
-    invalid_trust_ = web::CreateServerTrustFromChain(chain, kHostName);
-  }
-
-  // Returns NSArray of SecCertificateRef objects for the given |cert|.
-  NSArray* GetChain(const scoped_refptr<net::X509Certificate>& cert) const {
-    NSMutableArray* result = [NSMutableArray
-        arrayWithObject:static_cast<id>(cert->os_cert_handle())];
-    for (SecCertificateRef intermediate : cert->GetIntermediateCertificates()) {
-      [result addObject:static_cast<id>(intermediate)];
-    }
-    return result;
+    invalid_trust_ = web::CreateServerTrustFromChain(
+        static_cast<NSArray*>(chain.get()), kHostName);
   }
 
   // Synchronously returns result of
   // decideLoadPolicyForTrust:host:completionHandler: call.
   void DecidePolicy(const base::ScopedCFTypeRef<SecTrustRef>& trust,
                     NSString* host,
                     web::CertAcceptPolicy* policy,
                     net::CertStatus* status) {
     __block bool completion_handler_called = false;
     [controller_
@@ skipping 124 matching lines @@
   SecurityStyle style = SECURITY_STYLE_UNKNOWN;
   net::CertStatus status = net::CERT_STATUS_ALL_ERRORS;
 
   QueryStatus(invalid_trust_, kHostName, &style, &status);
   EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, style);
   EXPECT_TRUE(net::CERT_STATUS_AUTHORITY_INVALID & status);
   EXPECT_TRUE(net::CERT_STATUS_COMMON_NAME_INVALID & status);
 }
 
 }  // namespace web