Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: content/public/android/java/org/chromium/content/app/SandboxedProcessService.java

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove JNIHelper/BitmapHolder Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698