Run the later parts of startup as UI thread tasks

content/app/android/content_main.cc

 // 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.
 
 #include "content/app/android/content_main.h"
 
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
+#include "content/browser/android/android_startup_observer.h"
 #include "content/public/app/content_main.h"
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/app/content_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ContentMain_jni.h"
 
 using base::LazyInstance;
 using content::ContentMainRunner;
 using content::ContentMainDelegate;
 
 namespace {
 LazyInstance<scoped_ptr<ContentMainRunner> > g_content_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<ContentMainDelegate> > g_content_main_delegate =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace content {
 
 static void InitApplicationContext(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
   base::android::InitApplicationContext(scoped_context);
 }
 
-static jint Start(JNIEnv* env, jclass clazz) {
+static jint Start(JNIEnv* env,
+                  jclass clazz,
+                  jboolean immediate_startup,
+                  jobject java_startup_observer) {
   TRACE_EVENT0("startup", "content::Start");
 
+  java_startup_observer = env->NewGlobalRef(java_startup_observer);
+
   DCHECK(!g_content_runner.Get().get());
   g_content_runner.Get().reset(ContentMainRunner::Create());
-  g_content_runner.Get()->Initialize(0, NULL,
-                                     g_content_main_delegate.Get().get());
+
+  ContentMainDelegate* delegate = g_content_main_delegate.Get().get();
+
+  scoped_ptr<StartupTaskRunner::Observer> startup_observer(
+      new AndroidStartupObserver(java_startup_observer));
+
+  delegate->SetStartupObserver(startup_observer.Pass());
+  delegate->EnableIncrementalStartup(!immediate_startup);
+
+  g_content_runner.Get()
+      ->Initialize(0, NULL, g_content_main_delegate.Get().get());
   return g_content_runner.Get()->Run();
 }
 
 void SetContentMainDelegate(ContentMainDelegate* delegate) {
   DCHECK(!g_content_main_delegate.Get().get());
   g_content_main_delegate.Get().reset(delegate);
 }
 
 bool RegisterContentMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content