Empty startup task queue when tasks run synchronously

Also empty it when a task fails, and ensure that callback is only
called once. Extend the tests to check all this.

TEST=content_unittests --gtest_filter='StartupTaskRunner*'
BUG=304108

Review URL: https://codereview.chromium.org/25348004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228010 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 1 deletions

diff --git a/content/browser/startup_task_runner.cc b/content/browser/startup_task_runner.cc
index d1fc904..4746afe 100644
--- a/content/browser/startup_task_runner.cc
+++ b/content/browser/startup_task_runner.cc
@@ -27,6 +27,8 @@ void StartupTaskRunner::StartRunningTasksAsync() {
   if (task_list_.empty()) {
     if (!startup_complete_callback_.is_null()) {
       startup_complete_callback_.Run(result);
+      // Clear the callback to prevent it being called a second time
+      startup_complete_callback_.Reset();
     }
   } else {
     const base::Closure next_task =
@@ -43,8 +45,11 @@ void StartupTaskRunner::RunAllTasksNow() {
     result = it->Run();
     if (result > 0) break;
   }
+  task_list_.clear();
   if (!startup_complete_callback_.is_null()) {
     startup_complete_callback_.Run(result);
+    // Clear the callback to prevent it being called a second time
+    startup_complete_callback_.Reset();
   }
 }
 
@@ -57,9 +62,15 @@ void StartupTaskRunner::WrappedTask() {
   }
   int result = task_list_.front().Run();
   task_list_.pop_front();
-  if (result > 0 || task_list_.empty()) {
+  if (result > 0) {
+    // Stop now and throw away the remaining tasks
+    task_list_.clear();
+  }
+  if (task_list_.empty()) {
     if (!startup_complete_callback_.is_null()) {
       startup_complete_callback_.Run(result);
+      // Clear the callback to prevent it being called a second time
+      startup_complete_callback_.Reset();
     }
   } else {
     const base::Closure next_task =