[iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC.

ios/web/net/crw_cert_verification_controller.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"
 
 #include <memory>
 
 #include "base/ios/block_types.h"
 #include "base/logging.h"
@@ skipping 111 matching lines @@
   // Store user decisions with the leaf cert, ignoring any intermediates.
   // This is because WKWebView returns the verified certificate chain in
   // |webView:didReceiveAuthenticationChallenge:completionHandler:|,
   // but the server-supplied chain in
   // |webView:didFailProvisionalNavigation:withError:|.
   if (!cert->GetIntermediateCertificates().empty()) {
     cert = net::X509Certificate::CreateFromHandle(
         cert->os_cert_handle(), net::X509Certificate::OSCertHandles());
   }
   DCHECK(cert->GetIntermediateCertificates().empty());
-  web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, base::BindBlock(^{
-    _certPolicyCache->AllowCertForHost(
-        cert.get(), base::SysNSStringToUTF8(host), status);
-  }));
+  web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, base::BindBlockArc(^{
+                             _certPolicyCache->AllowCertForHost(
+                                 cert.get(), base::SysNSStringToUTF8(host),
+                                 status);
+                           }));
 }
 
 #pragma mark - Private
 
 - (net::CertStatus)certStatusFromTrustResult:(SecTrustResultType)trustResult
                                  serverTrust:
                                      (base::ScopedCFTypeRef<SecTrustRef>)trust {
   net::CertStatus certStatus = net::CertStatus();
   switch (trustResult) {
     case kSecTrustResultProceed:
@@ skipping 12 matching lines @@
   return certStatus;
 }
 
 - (void)
 decideLoadPolicyForRejectedTrustResult:(SecTrustResultType)trustResult
                            serverTrust:(base::ScopedCFTypeRef<SecTrustRef>)trust
                                   host:(NSString*)host
                      completionHandler:(web::PolicyDecisionHandler)handler {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
   DCHECK(handler);
-  web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, base::BindBlock(^{
-    // |loadPolicyForRejectedTrustResult:certStatus:serverTrust:host:| can
-    // only be called on IO thread.
-    net::CertStatus certStatus =
-        [self certStatusFromTrustResult:trustResult serverTrust:trust];
+  web::WebThread::PostTask(
+      web::WebThread::IO, FROM_HERE, base::BindBlockArc(^{
+        // |loadPolicyForRejectedTrustResult:certStatus:serverTrust:host:| can
+        // only be called on IO thread.
+        net::CertStatus certStatus =
+            [self certStatusFromTrustResult:trustResult serverTrust:trust];
 
-    web::CertAcceptPolicy policy =
-        [self loadPolicyForRejectedTrustResult:trustResult
-                                    certStatus:certStatus
-                                   serverTrust:trust.get()
-                                          host:host];
+        web::CertAcceptPolicy policy =
+            [self loadPolicyForRejectedTrustResult:trustResult
+                                        certStatus:certStatus
+                                       serverTrust:trust.get()
+                                              host:host];
 
-    web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlock(^{
-      handler(policy, certStatus);
-    }));
-  }));
+        web::WebThread::PostTask(web::WebThread::UI, FROM_HERE,
+                                 base::BindBlockArc(^{
+                                   handler(policy, certStatus);
+                                 }));
+      }));
 }
 
 - (void)verifyTrust:(base::ScopedCFTypeRef<SecTrustRef>)trust
     completionHandler:(void (^)(SecTrustResultType))completionHandler {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
   DCHECK(completionHandler);
   // SecTrustEvaluate performs trust evaluation synchronously, possibly making
   // network requests. The UI thread should not be blocked by that operation.
-  base::WorkerPool::PostTask(FROM_HERE, base::BindBlock(^{
-    SecTrustResultType trustResult = kSecTrustResultInvalid;
-    if (SecTrustEvaluate(trust.get(), &trustResult) != errSecSuccess) {
-      trustResult = kSecTrustResultInvalid;
-    }
-    web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlock(^{
-      completionHandler(trustResult);
-    }));
-  }), false /* task_is_slow */);
+  base::WorkerPool::PostTask(
+      FROM_HERE, base::BindBlockArc(^{
+        SecTrustResultType trustResult = kSecTrustResultInvalid;
+        if (SecTrustEvaluate(trust.get(), &trustResult) != errSecSuccess) {
+          trustResult = kSecTrustResultInvalid;
+        }
+        web::WebThread::PostTask(web::WebThread::UI, FROM_HERE,
+                                 base::BindBlockArc(^{
+                                   completionHandler(trustResult);
+                                 }));
+      }),
+      false /* task_is_slow */);
 }
 
 - (web::CertAcceptPolicy)
 loadPolicyForRejectedTrustResult:(SecTrustResultType)trustResult
                       certStatus:(net::CertStatus)certStatus
                      serverTrust:(SecTrustRef)trust
                             host:(NSString*)host {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK_NE(web::SECURITY_STYLE_AUTHENTICATED,
             web::GetSecurityStyleFromTrustResult(trustResult));
@@ skipping 12 matching lines @@
 
   web::CertPolicy::Judgment judgment = _certPolicyCache->QueryPolicy(
       leafCert.get(), base::SysNSStringToUTF8(host), certStatus);
 
   return (judgment == web::CertPolicy::ALLOWED)
              ? web::CERT_ACCEPT_POLICY_RECOVERABLE_ERROR_ACCEPTED_BY_USER
              : web::CERT_ACCEPT_POLICY_RECOVERABLE_ERROR_UNDECIDED_BY_USER;
 }
 
 @end