Upstream some more content/ DEPS-related cleanup.

content/public/android/java/org/chromium/content/app/SandboxedProcessService.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;
@@ skipping 75 matching lines @@
 
     @Override
     public void onCreate() {
         sContext = this;
         super.onCreate();
 
         mSandboxMainThread = new Thread(new Runnable() {
             @Override
             public void run()  {
                 try {
-                    // TODO(michaelbai): Upstream LibraryLoader.java
-                    // if (!LibraryLoader.loadNow()) return;
+                    if (!LibraryLoader.loadNow()) return;
                     synchronized (mSandboxMainThread) {
                         while (mCommandLineParams == null) {
                             mSandboxMainThread.wait();
                         }
                     }
-                    // LibraryLoader.initializeOnMainThread(mCommandLineParams);
+                    LibraryLoader.initializeOnMainThread(mCommandLineParams);
                     synchronized (mSandboxMainThread) {
                         mLibraryInitialized = true;
                         mSandboxMainThread.notifyAll();
                         while (mIPCFd == null) {
                             mSandboxMainThread.wait();
                         }
                     }
                     int crashFd = (mCrashFd == null) ? -1 : mCrashFd.detachFd();
                     ContentMain.initApplicationContext(sContext.getApplicationContext());
                     nativeInitSandboxedProcess(sContext.getApplicationContext(),
@@ skipping 104 matching lines @@
      * @param crashFd File descriptor for signaling crashes.
      */
     private static native void nativeInitSandboxedProcess(Context applicationContext,
             SandboxedProcessService service, int ipcFd, int crashFd);
 
     /**
      * Force the sandboxed process to exit.
      */
     private static native void nativeExitSandboxedProcess();
 }