Run the later parts of startup as UI thread tasks

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 25e0c3b9260d80dc75a461e21ce3a22340411deb..35da3af3f3f8193ac18c2970a6003515c7654f72 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -9,6 +9,7 @@
 #include "content/browser/accessibility/browser_accessibility_android.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/browser/android/android_browser_process.h"
+#include "content/browser/android/browser_startup_config.h"
 #include "content/browser/android/child_process_launcher_android.h"
 #include "content/browser/android/content_settings.h"
 #include "content/browser/android/content_video_view.h"
@@ -36,37 +37,37 @@ using content::SurfaceTexturePeerBrowserImpl;
 
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
-  { "AndroidLocationApiAdapter",
-    content::AndroidLocationApiAdapter::RegisterGeolocationService },
-  { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
-  { "BrowserAccessibilityManager",
-    content::RegisterBrowserAccessibilityManager },
-  { "ChildProcessLauncher", content::RegisterChildProcessLauncher },
-  { "ContentSettings", content::ContentSettings::RegisterContentSettings },
-  { "ContentViewRenderView",
-    content::ContentViewRenderView::RegisterContentViewRenderView },
-  { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
-  { "ContentViewCore", content::RegisterContentViewCore },
-  { "DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register },
-  { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid },
-  { "DownloadControllerAndroidImpl",
-    content::DownloadControllerAndroidImpl::RegisterDownloadController },
-  { "InterstitialPageDelegateAndroid",
-    content::InterstitialPageDelegateAndroid
-        ::RegisterInterstitialPageDelegateAndroid },
-  { "MediaResourceGetterImpl",
-    content::MediaResourceGetterImpl::RegisterMediaResourceGetter },
-  { "LoadUrlParams", content::RegisterLoadUrlParams },
-  { "PowerSaveBlock", content::RegisterPowerSaveBlocker },
-  { "RegisterImeAdapter", content::RegisterImeAdapter },
-  { "SpeechRecognizerImplAndroid",
-    content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer },
-  { "TouchPoint", content::RegisterTouchPoint },
-  { "TracingIntentHandler", content::RegisterTracingIntentHandler },
-  { "VibrationMessageFilter", content::VibrationMessageFilter::Register },
-  { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
-  { "WebViewStatics", content::RegisterWebViewStatics },
-};
+    {"AndroidLocationApiAdapter",
+     content::AndroidLocationApiAdapter::RegisterGeolocationService},
+    {"AndroidBrowserProcess", content::RegisterAndroidBrowserProcess},
+    {"BrowserAccessibilityManager",
+     content::RegisterBrowserAccessibilityManager},
+    {"BrowserStartupConfiguration", content::RegisterBrowserStartupConfig},
+    {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
+    {"ContentSettings", content::ContentSettings::RegisterContentSettings},
+    {"ContentViewRenderView",
+     content::ContentViewRenderView::RegisterContentViewRenderView},
+    {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
+    {"ContentViewCore", content::RegisterContentViewCore},
+    {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register},
+    {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
+    {"DownloadControllerAndroidImpl",
+     content::DownloadControllerAndroidImpl::RegisterDownloadController},
+    {"InterstitialPageDelegateAndroid",
+     content::InterstitialPageDelegateAndroid::
+         RegisterInterstitialPageDelegateAndroid},
+    {"MediaResourceGetterImpl",
+     content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
+    {"LoadUrlParams", content::RegisterLoadUrlParams},
+    {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
+    {"RegisterImeAdapter", content::RegisterImeAdapter},
+    {"SpeechRecognizerImplAndroid",
+     content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
+    {"TouchPoint", content::RegisterTouchPoint},
+    {"TracingIntentHandler", content::RegisterTracingIntentHandler},
+    {"VibrationMessageFilter", content::VibrationMessageFilter::Register},
+    {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},
+    {"WebViewStatics", content::RegisterWebViewStatics}, };
 
 }  // namespace