Remove CRWNetworkActivityIndicatorManager.

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>
 
 #include "base/bind_helpers.h"
 #include "base/containers/hash_tables.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 #import "ios/net/clients/crn_forwarding_network_client.h"
 #import "ios/net/clients/crn_forwarding_network_client_factory.h"
-#import "ios/web/crw_network_activity_indicator_manager.h"
 #import "ios/web/history_state_util.h"
 #import "ios/web/net/crw_request_tracker_delegate.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/certificate_policy_cache.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/url_util.h"
 #include "ios/web/public/web_thread.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ skipping 439 matching lines @@
 net::URLRequestContext* RequestTrackerImpl::GetRequestContext() {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   return request_context_getter_->GetURLRequestContext();
 }
 
 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::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();
     new_estimate_round_ = false;
   }
   const GURL& url = request->original_url();
   TrackerCounts* counts = new TrackerCounts(
       GURLByRemovingRefFromGURL(url), request);
@@ skipping 50 matching lines @@
       // Something is wrong with the estimate, it is too low. Ignore it.
       counts->expected_length = 0;
     }
     Notify();
   }
 }
 
 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::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::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())
       counts->ssl_info = ssl_info;
     counts->done = true;
     counts_by_request_.erase(request);
   }
 }
@@ skipping 665 matching lines @@
   ScopedVector<TrackerCounts>::iterator it;
   for (it = counts_.begin(); it != counts_.end(); ++it)
     [urls addObject:(*it)->Description()];
 
   return [NSString stringWithFormat:@"RequestGroupID %@\n%@\n%@",
                                     request_group_id_.get(),
                                     net::NSURLWithGURL(page_url_),
                                     [urls componentsJoinedByString:@"\n"]];
 }
 
-NSString* RequestTrackerImpl::GetNetworkActivityKey() {
-  return [NSString
-      stringWithFormat:@"RequestTrackerImpl.NetworkActivityIndicatorKey.%@",
-                       request_group_id_.get()];
-  }
-
 void RequestTrackerImpl::CancelRequests() {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   std::set<net::URLRequest*>::iterator it;
   // TODO(droger): When canceling the request, we should in theory make sure
   // that the NSURLProtocol client method |didFailWithError| is called,
   // otherwise the iOS system may wait indefinitely for the request to complete.
   // However, as we currently only cancel the requests when closing a tab, the
   // 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::BindBlockArc(^{
-          [[CRWNetworkActivityIndicatorManager sharedInstance]
-              clearNetworkTasksForGroup:networkActivityKey];
-        }));
-  }
 }
 
 void RequestTrackerImpl::SetCertificatePolicyCacheForTest(
     web::CertificatePolicyCache* cache) {
   policy_cache_ = cache;
 }
 
 }  // namespace web