Domain Reliability: More security review.

components/domain_reliability/dispatcher.h

 // 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.
 
 #ifndef COMPONENTS_DOMAIN_RELIABILITY_DISPATCHER_H_
 #define COMPONENTS_DOMAIN_RELIABILITY_DISPATCHER_H_
 
 #include <set>
 
 #include "base/callback.h"
-#include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/domain_reliability_export.h"
 #include "components/domain_reliability/util.h"
 
 namespace tracked_objects {
 class Location;
 }  // namespace tracked_objects
 
 namespace domain_reliability {
 
 // Runs tasks during a specified interval. Calling |RunEligibleTasks| gives any
 // task a chance to run early (if the minimum delay has already passed); tasks
 // that aren't run early will be run once their maximum delay has passed.
 //
 // (See scheduler.h for an explanation of how the intervals are chosen.)
 class DOMAIN_RELIABILITY_EXPORT DomainReliabilityDispatcher {
  public:
-  DomainReliabilityDispatcher(MockableTime* time);
+  explicit DomainReliabilityDispatcher(MockableTime* time);
   ~DomainReliabilityDispatcher();
 
-  void ScheduleTask(
-      const base::Closure& task,
-      base::TimeDelta min_delay,
-      base::TimeDelta max_delay);
+  // Schedules |task| to be executed between |min_delay| and |max_delay| from
+  // now.

[Ryan Sleevi, 2014/05/06 22:50:41]

Is it a random delay, or is it just a weak guarantee that the task will not be
executed before min_delay, and will be executed before max_delay?

[Deprecated (see juliatuttle), 2014/05/07 02:36:07]

Weak guarantee. I've updated the comment.

+  void ScheduleTask(const base::Closure& task,
+                    base::TimeDelta min_delay,
+                    base::TimeDelta max_delay);
 
+  // Runs all tasks whose minimum delay has already passed.
   void RunEligibleTasks();
 
  private:
-  struct Task {
-    Task(const base::Closure& closure_p,
-         scoped_ptr<MockableTime::Timer> timer_p,
-         base::TimeDelta min_delay_p,
-         base::TimeDelta max_delay_p);
-    ~Task();
+  struct Task;
 
-    base::Closure closure;
-    scoped_ptr<MockableTime::Timer> timer;
-    base::TimeDelta min_delay;
-    base::TimeDelta max_delay;
-    bool eligible;
-  };
+  // Adds |task| to the set of all tasks, but not the set of eligible tasks.
+  void MakeTaskWaiting(Task* task);
 
-  void MakeTaskWaiting(Task* task);
+  // Adds |task| to the set of eligible tasks, and also the set of all tasks
+  // if not already there.
   void MakeTaskEligible(Task* task);
+
+  // Runs |task|'s callback, removes it from both sets, and deletes it.
   void RunAndDeleteTask(Task* task);
 
   MockableTime* time_;
   std::set<Task*> tasks_;
   std::set<Task*> eligible_tasks_;
 };
 
 }  // namespace domain_reliability
 
 #endif