[iOS/OS X] Allow base::scoped_nsobject<> to be used when ARC is enabled.

ios/web/net/cert_verifier_block_adapter.cc

Index: ios/web/net/cert_verifier_block_adapter.cc
diff --git a/ios/web/net/cert_verifier_block_adapter.cc b/ios/web/net/cert_verifier_block_adapter.cc
deleted file mode 100644
index dd3a83605b727c6dc262d20c7cba77cf6dca99a5..0000000000000000000000000000000000000000
--- a/ios/web/net/cert_verifier_block_adapter.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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.
-
-#include "ios/web/net/cert_verifier_block_adapter.h"
-
-#include <utility>
-
-#include "base/mac/bind_objc_block.h"
-#include "net/base/net_errors.h"
-#include "net/cert/crl_set.h"
-#include "net/cert/x509_certificate.h"
-#include "net/log/net_log.h"
-
-namespace web {
-
-namespace {
-
-// Resource manager which keeps CertVerifyResult, X509Certificate,
-// CertVerifier::Request and BoundNetLog alive until verification is completed.
-// This class is refcounted so it can be captured by a block, keeping its
-// members alive.
-struct VerificationContext
-    : public base::RefCountedThreadSafe<VerificationContext> {
-  VerificationContext(scoped_refptr<net::X509Certificate> cert,
-                      net::NetLog* net_log)
-      : request(nullptr),
-        cert(std::move(cert)),
-        net_log(net::BoundNetLog::Make(
-            net_log,
-            net::NetLog::SOURCE_IOS_WEB_VIEW_CERT_VERIFIER)) {}
-
-  // Stores the current verification request. The request must outlive the
-  // VerificationContext and the CertVerifierBlockAdapter, so that the
-  // verification request is not cancelled. CertVerifierBlockAdapter::Verify
-  // guarantees its completion handler to be called, which will not happen if
-  // verification request is cancelled.
-  scoped_ptr<net::CertVerifier::Request> request;
-  // The result of certificate verification.
-  net::CertVerifyResult result;
-  // Certificate being verified.
-  scoped_refptr<net::X509Certificate> cert;
-  // BoundNetLog required by CertVerifier.
-  net::BoundNetLog net_log;
-
- private:
-  friend class base::RefCountedThreadSafe<VerificationContext>;
-  VerificationContext() = delete;
-  ~VerificationContext() {}
-};
-}
-
-CertVerifierBlockAdapter::CertVerifierBlockAdapter(
-    net::CertVerifier* cert_verifier,
-    net::NetLog* net_log)
-    : cert_verifier_(cert_verifier), net_log_(net_log) {
-  DCHECK(cert_verifier_);
-}
-
-CertVerifierBlockAdapter::~CertVerifierBlockAdapter() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-}
-
-CertVerifierBlockAdapter::Params::Params(
-    const scoped_refptr<net::X509Certificate>& cert,
-    const std::string& hostname)
-    : cert(cert), hostname(hostname), flags(0) {}
-
-CertVerifierBlockAdapter::Params::~Params() {
-}
-
-void CertVerifierBlockAdapter::Verify(
-    const Params& params,
-    void (^completion_handler)(net::CertVerifyResult, int)) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(completion_handler);
-  if (!params.cert || params.hostname.empty()) {
-    completion_handler(net::CertVerifyResult(), net::ERR_INVALID_ARGUMENT);
-    return;
-  }
-
-  scoped_refptr<VerificationContext> context(
-      new VerificationContext(params.cert, net_log_));
-  net::CompletionCallback callback = base::BindBlock(^(int error) {
-    completion_handler(context->result, error);
-  });
-  scoped_ptr<net::CertVerifier::Request> request;
-  int error = cert_verifier_->Verify(params.cert.get(), params.hostname,
-                                     params.ocsp_response, params.flags,
-                                     params.crl_set.get(), &(context->result),
-                                     callback, &request, context->net_log);
-  if (error == net::ERR_IO_PENDING) {
-    // Keep the |net::CertVerifier::Request| alive until verification completes.
-    // Because |context| is kept alive by |callback| (through base::BindBlock),
-    // this means that the cert verification request cannot be cancelled.
-    // However, it guarantees that |callback| - and thus |completion_handler| -
-    // will always be called, which is a necessary part of the API contract of
-    // |CertVerifierBlockAdapter::Verify()|.
-    context->request = std::move(request);
-    // Completion handler will be called from |callback| when verification
-    // request is completed.
-    return;
-  }
-
-  // Verification has either failed or result was retrieved from the cache.
-  completion_handler(context->result, error);
-}
-
-}  // namespace web