Run the later parts of startup as UI thread tasks

content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

 // 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.
 
 package org.chromium.content.app;
 
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.SurfaceTexture;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Surface;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ChildProcessConnection;
+import org.chromium.content.browser.StartupObserver;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
 import org.chromium.content.browser.ChildProcessLauncher;
 import org.chromium.content.common.ProcessInitException;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This is the base class for child services; the [Non]SandboxedProcessService0, 1.. etc
@@ skipping 99 matching lines @@
                             mMainThread.wait();
                         }
                     }
                     assert mFileIds.size() == mFileFds.size();
                     int[] fileIds = new int[mFileIds.size()];
                     int[] fileFds = new int[mFileFds.size()];
                     for (int i = 0; i < mFileIds.size(); ++i) {
                         fileIds[i] = mFileIds.get(i);
                         fileFds[i] = mFileFds.get(i).detachFd();
                     }
-                    ContentMain.initApplicationContext(sContext.get().getApplicationContext());
+                    ContentMain contentMain = new ContentMain();
+                    contentMain.initApplicationContext(sContext.get().getApplicationContext());
                     nativeInitChildProcess(sContext.get().getApplicationContext(),
                             ChildProcessService.this, fileIds, fileFds,
                             mCpuCount, mCpuFeatures);
-                    ContentMain.start();
+                    contentMain.start(true, new StartupObserver());

[joth, 2013/07/22 16:28:15]

initApplicationContext & start are still static (I think?) so it will give a
warning (checkbugs?) to call these methods on object rather than class.

[aberent, 2013/07/22 19:37:40]

Done. I should have reverted these changes; at one point in developing this CL I
thought I needed a real ContentMain object, but I don't. Will fix on next
update.

                     nativeExitChildProcess();
                 } catch (InterruptedException e) {
                     Log.w(TAG, MAIN_THREAD_NAME + " startup failed: " + e);
                 } catch (ProcessInitException e) {
                     Log.w(TAG, MAIN_THREAD_NAME + " startup failed: " + e);
                 }
             }
         }, MAIN_THREAD_NAME);
         mMainThread.start();
     }
@@ skipping 110 matching lines @@
             ChildProcessService service, int[] extraFileIds, int[] extraFileFds,
             int cpuCount, long cpuFeatures);
 
     /**
      * Force the child process to exit.
      */
     private static native void nativeExitChildProcess();
 
     private native void nativeShutdownMainThread();
 }