Run the later parts of startup as UI thread tasks

content/browser/startup_task_runner.h

Index: content/browser/startup_task_runner.h
diff --git a/content/browser/startup_task_runner.h b/content/browser/startup_task_runner.h
new file mode 100644
index 0000000000000000000000000000000000000000..8b40540bff68a6be500baac1bff07da9919cdf94
--- /dev/null
+++ b/content/browser/startup_task_runner.h
@@ -0,0 +1,65 @@
+// Copyright (c) 2013 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_STARTUP_TASK_RUNNER_H_
+#define CONTENT_BROWSER_STARTUP_TASK_RUNNER_H_
+
+#include <list>
+
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
+
+#include "build/build_config.h"
+
+#include "content/public/browser/browser_main_runner.h"
+
+namespace content {
+
+typedef base::Callback<int(void)> StartupTask;

[jam, 2013/07/31 18:07:52]

nit: please document what the int return value is used for

[aberent, 2013/07/31 20:56:51]

Done.

+
+// This class runs startup tasks. The tasks are either run immediately inline,
+// or are queued one at a time on the UI thread's message loop. If the events
+// are queued, UI events that are received during startup will be acted upon
+// between startup tasks. The motivation for this is that, on targets where the
+// UI is already started, it allows us to keep the UI responsive during startup.
+//
+// Note that this differs from a SingleThreadedTaskRunner in that there may be
+// no opportunity to handle UI events between the tasks of a
+// SingleThreadedTaskRunner.
+
+class CONTENT_EXPORT StartupTaskRunner
+    : public base::RefCounted<StartupTaskRunner> {
+
+ public:
+

[jam, 2013/07/31 18:07:52]

nit: here and below, no blank like after "public" and "private" per convention

[aberent, 2013/07/31 20:56:51]

Done.

+  // Constructor: Note that |startup_complete_callback| is optional. If it is
+  // not null it will be called once all the startup tasks have run.
+  StartupTaskRunner(bool browser_may_start_asynchronously,
+                    void (*const startup_complete_callback)(int result),
+                    scoped_refptr<base::SingleThreadTaskRunner> proxy);
+
+  // Add a task to the queue of startup tasks to be run.
+  virtual void AddTask(StartupTask& callback);
+
+  // Start running the tasks.
+  virtual void StartRunningTasks();
+
+ private:
+
+  friend class base::RefCounted<StartupTaskRunner>;
+  virtual ~StartupTaskRunner();
+
+  std::list<StartupTask> task_list_;
+  void WrappedTask();
+
+  const bool asynchronous_startup_;
+  void (*const startup_complete_callback_)(int result);
+  scoped_refptr<base::SingleThreadTaskRunner> proxy_;
+
+  DISALLOW_COPY_AND_ASSIGN(StartupTaskRunner);
+};
+
+}  // namespace content
+#endif  // CONTENT_BROWSER_STARTUP_TASK_RUNNER_H_