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

Unified Diff: testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java

Issue 1930443003: Reland of Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix native unit tests. Created 4 years, 8 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: testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java
index c70854912a2c312be2aaa2d2bffe6c04f66cd926..84115838972fbedbc8e6b056cfc1ded075cdfca5 100644
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java
@@ -6,6 +6,7 @@ package org.chromium.native_test;
import android.os.Bundle;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.PathUtils;
import org.chromium.base.PowerMonitor;
@@ -29,6 +30,7 @@ public class NativeUnitTestActivity extends NativeTestActivity {
// Needed by system_monitor_unittest.cc
PowerMonitor.createForTests(this);
+ ContextUtils.initApplicationContext(getApplicationContext());
loadLibraries();
}
@@ -38,5 +40,6 @@ public class NativeUnitTestActivity extends NativeTestActivity {
System.loadLibrary(library);
Log.i(TAG, "loaded: %s", library);
}
+ ContextUtils.initApplicationContextForNative();
}
}

Powered by Google App Engine
This is Rietveld 408576698