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

ios/web/net/request_tracker_impl.mm

 // Copyright 2014 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/request_tracker_impl.h"
 
 #include <pthread.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 466 matching lines @@
 
 void RequestTrackerImpl::StartRequest(net::URLRequest* request) {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK(!counts_by_request_.count(request));
   DCHECK_EQ(is_for_static_file_requests_, request->url().SchemeIsFile());
 
   bool addedRequest = live_requests_.insert(request).second;
   if (!is_for_static_file_requests_ && addedRequest) {
     NSString* networkActivityKey = GetNetworkActivityKey();
     web::WebThread::PostTask(
-        web::WebThread::UI, FROM_HERE,
-        base::BindBlock(^{
+        web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
           [[CRWNetworkActivityIndicatorManager sharedInstance]
               startNetworkTaskForGroup:networkActivityKey];
         }));
   }
 
   if (new_estimate_round_) {
     // Starting a new estimate round. Ignore the previous requests for the
     // calculation.
     counts_by_request_.clear();
     estimate_start_index_ = counts_.size();
@@ skipping 59 matching lines @@
   }
 }
 
 void RequestTrackerImpl::StopRequest(net::URLRequest* request) {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
 
   int removedRequests = live_requests_.erase(request);
   if (!is_for_static_file_requests_ && removedRequests > 0) {
     NSString* networkActivityKey = GetNetworkActivityKey();
     web::WebThread::PostTask(
-        web::WebThread::UI, FROM_HERE,
-        base::BindBlock(^{
+        web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
           [[CRWNetworkActivityIndicatorManager sharedInstance]
               stopNetworkTaskForGroup:networkActivityKey];
         }));
   }
 
   if (counts_by_request_.count(request)) {
     StopRedirectedRequest(request);
     Notify();
   }
 }
 
 void RequestTrackerImpl::StopRedirectedRequest(net::URLRequest* request) {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
 
   int removedRequests = live_requests_.erase(request);
   if (!is_for_static_file_requests_ && removedRequests > 0) {
     NSString* networkActivityKey = GetNetworkActivityKey();
     web::WebThread::PostTask(
-        web::WebThread::UI, FROM_HERE,
-        base::BindBlock(^{
+        web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
           [[CRWNetworkActivityIndicatorManager sharedInstance]
               stopNetworkTaskForGroup:networkActivityKey];
         }));
   }
 
   if (counts_by_request_.count(request)) {
     TrackerCounts* counts = counts_by_request_[request];
     DCHECK(!counts->done);
     const net::SSLInfo& ssl_info = request->ssl_info();
     if (ssl_info.is_valid())
@@ skipping 141 matching lines @@
   RequestTrackerImpl* inconstant_t = const_cast<RequestTrackerImpl*>(t);
   if (web::WebThread::CurrentlyOn(web::WebThread::IO)) {
     inconstant_t->Destruct();
   } else {
     // Use BindBlock rather than Bind to avoid creating another scoped_refpter
     // to |this|. |inconstant_t| isn't retained by the block, but since this
     // method is the mechanism by which all RequestTrackerImpl instances are
     // destroyed, the object inconstant_t points to won't be deleted while
     // the block is executing (and Destruct() itself will do the deleting).
     web::WebThread::PostTask(web::WebThread::IO, FROM_HERE,
-                             base::BindBlock(^{
+                             base::BindBlockArc(^{
                                inconstant_t->Destruct();
                              }));
   }
 }
 
 void RequestTrackerImpl::Destruct() {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK(is_closing_);
 
   pthread_once(&g_once_control, &InitializeGlobals);
   {
     base::AutoLock scoped_lock(*g_trackers_lock);
     g_trackers->erase(request_group_id_);
   }
   InvalidateWeakPtrs();
   // Delete on the UI thread.
-  web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlock(^{
-                                                            delete this;
-                                                          }));
+  web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
+                             delete this;
+                           }));
 }
 
 #pragma mark Other private methods
 
 void RequestTrackerImpl::Notify() {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   if (is_closing_)
     return;
   // Notify() is called asynchronously, it runs later on the same
   // thread. This is used to collate notifications together, avoiding
@@ skipping 512 matching lines @@
   // requests are all canceled by the system shortly after and nothing bad
   // happens.
   for (it = live_requests_.begin(); it != live_requests_.end(); ++it)
     (*it)->Cancel();
 
   int removedRequests = live_requests_.size();
   live_requests_.clear();
   if (!is_for_static_file_requests_ && removedRequests > 0) {
     NSString* networkActivityKey = GetNetworkActivityKey();
     web::WebThread::PostTask(
-        web::WebThread::UI, FROM_HERE,
-        base::BindBlock(^{
+        web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
           [[CRWNetworkActivityIndicatorManager sharedInstance]
               clearNetworkTasksForGroup:networkActivityKey];
         }));
   }
 }
 
 void RequestTrackerImpl::SetCertificatePolicyCacheForTest(
     web::CertificatePolicyCache* cache) {
   policy_cache_ = cache;
 }
 
 }  // namespace web