Revert of Remove ExtensionService Garbage-Collecting methods.

extensions/common/one_shot_event.cc

Index: extensions/common/one_shot_event.cc
diff --git a/extensions/common/one_shot_event.cc b/extensions/common/one_shot_event.cc
index ebba0d1823000dfca59cca791446661df8ee5054..28f91cb2060255693a358d4757ff1e884412a2cc 100644
--- a/extensions/common/one_shot_event.cc
+++ b/extensions/common/one_shot_event.cc
@@ -5,11 +5,9 @@
 #include "extensions/common/one_shot_event.h"
 
 #include "base/callback.h"
-#include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner.h"
-#include "base/time/time.h"
 
 using base::TaskRunner;
 
@@ -19,15 +17,13 @@
   TaskInfo() {}
   TaskInfo(const tracked_objects::Location& from_here,
            const scoped_refptr<TaskRunner>& runner,
-           const base::Closure& task,
-           const base::TimeDelta& delay)
-      : from_here(from_here), runner(runner), task(task), delay(delay) {
+           const base::Closure& task)
+      : from_here(from_here), runner(runner), task(task) {
     CHECK(runner.get());  // Detect mistakes with a decent stack frame.
   }
   tracked_objects::Location from_here;
   scoped_refptr<TaskRunner> runner;
   base::Closure task;
-  base::TimeDelta delay;
 };
 
 OneShotEvent::OneShotEvent() : signaled_(false) {
@@ -42,20 +38,19 @@
 
 void OneShotEvent::Post(const tracked_objects::Location& from_here,
                         const base::Closure& task) const {
-  PostImpl(
-      from_here, task, base::MessageLoopProxy::current(), base::TimeDelta());
+  Post(from_here, task, base::MessageLoopProxy::current());
 }
 
 void OneShotEvent::Post(const tracked_objects::Location& from_here,
                         const base::Closure& task,
                         const scoped_refptr<TaskRunner>& runner) const {
-  PostImpl(from_here, task, runner, base::TimeDelta());
-}
+  DCHECK(thread_checker_.CalledOnValidThread());
 
-void OneShotEvent::PostDelayed(const tracked_objects::Location& from_here,
-                               const base::Closure& task,
-                               const base::TimeDelta& delay) const {
-  PostImpl(from_here, task, base::MessageLoopProxy::current(), delay);
+  if (is_signaled()) {
+    runner->PostTask(from_here, task);
+  } else {
+    tasks_.push_back(TaskInfo(from_here, runner, task));
+  }
 }
 
 void OneShotEvent::Signal() {
@@ -71,27 +66,7 @@
   // We could randomize tasks_ in debug mode in order to check that
   // the order doesn't matter...
   for (size_t i = 0; i < tasks_.size(); ++i) {
-    const TaskInfo& task = tasks_[i];
-    if (task.delay != base::TimeDelta())
-      task.runner->PostDelayedTask(task.from_here, task.task, task.delay);
-    else
-      task.runner->PostTask(task.from_here, task.task);
-  }
-}
-
-void OneShotEvent::PostImpl(const tracked_objects::Location& from_here,
-                            const base::Closure& task,
-                            const scoped_refptr<TaskRunner>& runner,
-                            const base::TimeDelta& delay) const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  if (is_signaled()) {
-    if (delay != base::TimeDelta())
-      runner->PostDelayedTask(from_here, task, delay);
-    else
-      runner->PostTask(from_here, task);
-  } else {
-    tasks_.push_back(TaskInfo(from_here, runner, task, delay));
+    tasks_[i].runner->PostTask(tasks_[i].from_here, tasks_[i].task);
   }
 }