Fix a problem with duplicate calls to FrameFetchContext::dispatchDidFail

components/scheduler/renderer/web_view_scheduler_impl.h

 // 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.
 
 #ifndef COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
 #define COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 35 matching lines @@
   void enableVirtualTime() override;
   bool virtualTimeAllowedToAdvance() const override;
   void setVirtualTimePolicy(VirtualTimePolicy virtual_time_policy) override;
 
   // Virtual for testing.
   virtual void AddConsoleWarning(const std::string& message);
 
   std::unique_ptr<WebFrameSchedulerImpl> createWebFrameSchedulerImpl(
       base::trace_event::BlameContext* blame_context);
 
-  void incrementPendingResourceLoadCount();
-  void decrementPendingResourceLoadCount();
+  void DidStartLoading(unsigned long identifier);
+  void DidStopLoading(unsigned long identifier);
 
  private:
   friend class WebFrameSchedulerImpl;
 
   void Unregister(WebFrameSchedulerImpl* frame_scheduler);
 
   AutoAdvancingVirtualTimeDomain* virtual_time_domain() const {
     return virtual_time_domain_.get();
   }
 
   void setAllowVirtualTimeToAdvance(bool allow_virtual_time_to_advance);
 
   std::set<WebFrameSchedulerImpl*> frame_schedulers_;
+  std::set<unsigned long> pending_fetches_;

[Sami, 2016/07/07 11:21:40]

naming nit: how about pending_loads_ to keep the terminology consistent?

[alex clarke (OOO till 29th), 2016/07/07 12:10:04]

Done.

   std::unique_ptr<AutoAdvancingVirtualTimeDomain> virtual_time_domain_;
   TaskQueue::PumpPolicy virtual_time_pump_policy_;
   blink::WebView* web_view_;
   RendererSchedulerImpl* renderer_scheduler_;
-  int pending_resource_load_count_;
   VirtualTimePolicy virtual_time_policy_;
   bool page_visible_;
   bool disable_background_timer_throttling_;
   bool allow_virtual_time_to_advance_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewSchedulerImpl);
 };
 
 }  // namespace scheduler
 
 #endif  // COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_