Fix a problem with duplicate calls to FrameFetchContext::dispatchDidFail

components/scheduler/renderer/web_view_scheduler_impl.cc

 // 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 "components/scheduler/renderer/web_view_scheduler_impl.h"
 
 #include "base/logging.h"
 #include "components/scheduler/base/virtual_time_domain.h"
 #include "components/scheduler/child/scheduler_tqm_delegate.h"
 #include "components/scheduler/renderer/auto_advancing_virtual_time_domain.h"
 #include "components/scheduler/renderer/renderer_scheduler_impl.h"
 #include "components/scheduler/renderer/web_frame_scheduler_impl.h"
 #include "third_party/WebKit/public/platform/WebFrameScheduler.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace scheduler {
 
 WebViewSchedulerImpl::WebViewSchedulerImpl(
     blink::WebView* web_view,
     RendererSchedulerImpl* renderer_scheduler,
     bool disable_background_timer_throttling)
     : virtual_time_pump_policy_(TaskQueue::PumpPolicy::AUTO),
       web_view_(web_view),
       renderer_scheduler_(renderer_scheduler),
-      pending_resource_load_count_(0),
       virtual_time_policy_(VirtualTimePolicy::ADVANCE),
       page_visible_(true),
       disable_background_timer_throttling_(disable_background_timer_throttling),
       allow_virtual_time_to_advance_(true) {
   renderer_scheduler->AddWebViewScheduler(this);
 }
 
 WebViewSchedulerImpl::~WebViewSchedulerImpl() {
   // TODO(alexclarke): Find out why we can't rely on the web view outliving the
   // frame.
@@ skipping 73 matching lines @@
   if (virtual_time_domain_) {
     virtual_time_domain_->SetCanAdvanceVirtualTime(
         allow_virtual_time_to_advance);
   }
 }
 
 bool WebViewSchedulerImpl::virtualTimeAllowedToAdvance() const {
   return allow_virtual_time_to_advance_;
 }
 
-void WebViewSchedulerImpl::incrementPendingResourceLoadCount() {
-  pending_resource_load_count_++;
+void WebViewSchedulerImpl::DidStartLoading(unsigned long identifier) {
+  pending_loads_.insert(identifier);
 
   if (virtual_time_policy_ !=
       VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING) {
     return;
   }
 
-  if (pending_resource_load_count_ == 1)
+  if (pending_loads_.size() == 1u)
     setAllowVirtualTimeToAdvance(false);
 }
 
-void WebViewSchedulerImpl::decrementPendingResourceLoadCount() {
-  pending_resource_load_count_--;
-  DCHECK_GE(pending_resource_load_count_, 0);
+void WebViewSchedulerImpl::DidStopLoading(unsigned long identifier) {
+  pending_loads_.erase(identifier);
 
   if (virtual_time_policy_ !=
       VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING) {
       return;
   }
 
-  if (pending_resource_load_count_ == 0)
+  if (pending_loads_.size() == 0)
       setAllowVirtualTimeToAdvance(true);
 }
 
 void WebViewSchedulerImpl::setVirtualTimePolicy(VirtualTimePolicy policy) {
   virtual_time_policy_ = policy;
 
   switch (virtual_time_policy_) {
     case VirtualTimePolicy::ADVANCE:
       setAllowVirtualTimeToAdvance(true);
       break;
 
     case VirtualTimePolicy::PAUSE:
       setAllowVirtualTimeToAdvance(false);
       break;
 
     case VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING:
-      setAllowVirtualTimeToAdvance(pending_resource_load_count_ == 0);
+      setAllowVirtualTimeToAdvance(pending_loads_.size() == 0);
       break;
   }
 }
 
 }  // namespace scheduler