Add coalescing timer to ResourceScheduler. CL 2 from BUG=128035.

content/browser/loader/resource_scheduler.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/timer/timer.h"
 #include "content/common/content_export.h"
 #include "net/base/priority_queue.h"
 #include "net/base/request_priority.h"
 
 namespace net {
 class HostPortPair;
 class URLRequest;
 }
 
 namespace content {
@@ skipping 37 matching lines @@
     // Note that clients which would be COALESCED are UNTHROTTLED until
     // coalescing is turned on.
     UNTHROTTLED,
     // Observable (active) loading client.
     ACTIVE_AND_LOADING,
   };
 
   ResourceScheduler();
   ~ResourceScheduler();
 
+  // Use a mock timer when testing.
+  void set_timer_for_testing(scoped_ptr<base::Timer> timer) {
+    DCHECK(timer);
+    coalescing_timer_.reset();
+    coalescing_timer_.reset(timer.release());
+  }
+
   // TODO(aiolos): Remove when throttling and coalescing have landed
   void SetThrottleOptionsForTesting(bool should_throttle, bool should_coalesce);
 
   bool should_coalesce() const { return should_coalesce_; }
   bool should_throttle() const { return should_throttle_; }
 
   ClientThrottleState GetClientStateForTesting(int child_id, int route_id);
 
   // Requests that this ResourceScheduler schedule, and eventually loads, the
   // specified |url_request|. Caller should delete the returned ResourceThrottle
@@ skipping 48 matching lines @@
   class Client;
 
   typedef int64 ClientId;
   typedef std::map<ClientId, Client*> ClientMap;
   typedef std::set<ScheduledResourceRequest*> RequestSet;
 
   // Called when a ScheduledResourceRequest is destroyed.
   void RemoveRequest(ScheduledResourceRequest* request);
 
   // These Calls may update the ThrottleState of all clients, and have the
   // potential to be re-entarant.

[mmenke, 2014/07/16 17:01:34]

nit:  While you're here, this should be "re-entrant", and "Calls" shouldn't be
capitalized.

   // Called when a Client newly becomes active loading.
+  void IncrementActiveClientsLoading();
+  // Caled when a Client stops being active loading.

[mmenke, 2014/07/16 17:01:34]

nit:  "Called".  Also, grammar isn't quite right.  Maybe "Called when an active
and loading client becomes either inactive or completes loading."  Could update
the other comment to match, too.

   void DecrementActiveClientsLoading();

[aiolos (Not reviewing), 2014/07/15 23:54:58]

The comments were in the wrong order. If you want this broken out into another
CL, let me know.

[mmenke, 2014/07/16 17:01:34]

I'm fine with the change in this CL.

-  // Caled when a Client stops being active loading.
-  void IncrementActiveClientsLoading();
 
   void OnLoadingActiveClientsStateChanged();
 
   size_t CountActiveClientsLoading();
 
+  // Called when a Client becomes coalesced.
+  void IncrementCoalescedClients();
+  // Called when a client stops being coalesced.
+  void DecrementCoalescedClients();
+
+  size_t CountCoalescedClients();
+
+  void LoadCoalescedRequests();
+
   // Update the queue position for |request|, possibly causing it to start
   // loading.
   //
   // Queues are maintained for each priority level. When |request| is
   // reprioritized, it will move to the end of the queue for that priority
   // level.
   void ReprioritizeRequest(ScheduledResourceRequest* request,
                            net::RequestPriority new_priority,
                            int intra_priority_value);
 
   // Returns the client ID for the given |child_id| and |route_id| combo.
   ClientId MakeClientId(int child_id, int route_id);
 
   // Returns the client for the given |child_id| and |route_id| combo.
   Client* GetClient(int child_id, int route_id);
 
   bool should_coalesce_;
   bool should_throttle_;
   ClientMap client_map_;
   size_t active_clients_loading_;
+  size_t coalesced_clients_;
+  scoped_ptr<base::Timer> coalescing_timer_;
   RequestSet unowned_requests_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_