Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: ios/web/net/request_tracker_impl.mm

Issue 2566493003: Remove CRWNetworkActivityIndicatorManager. (Closed)
Patch Set: Remove duplicate file refs. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/net/request_tracker_impl.h ('k') | ios/web/web_state/crw_pass_kit_downloader.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/net/request_tracker_impl.mm
diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm
index 9bb48e30d18d5ae21638a87552587f739a35d076..5595fc748b3d96a5a5bfac344db47545fd6fba23 100644
--- a/ios/web/net/request_tracker_impl.mm
+++ b/ios/web/net/request_tracker_impl.mm
@@ -20,7 +20,6 @@
#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"
@@ -480,16 +479,6 @@ void RequestTrackerImpl::StartRequest(net::URLRequest* request) {
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.
@@ -560,16 +549,6 @@ void RequestTrackerImpl::CaptureReceivedBytes(const net::URLRequest* request,
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();
@@ -579,16 +558,6 @@ void RequestTrackerImpl::StopRequest(net::URLRequest* request) {
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);
@@ -1274,12 +1243,6 @@ NSString* RequestTrackerImpl::UnsafeDescription() {
[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;
@@ -1292,16 +1255,7 @@ void RequestTrackerImpl::CancelRequests() {
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(
« no previous file with comments | « ios/web/net/request_tracker_impl.h ('k') | ios/web/web_state/crw_pass_kit_downloader.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698