| Index: content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
|
| diff --git a/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java b/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
|
| index 1bca3d70afa6b3119d872945f0593943db929ac2..5bbb3bb34098b314b82d821f3816f0d0424c40bb 100644
|
| --- a/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
|
| +++ b/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
|
| @@ -93,14 +93,13 @@ public class SandboxedProcessService extends Service {
|
| @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();
|
|
|