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

Unified Diff: testing/android/native_test/native_test_launcher.cc

Issue 1934623002: Revert of patch suspect of causing Android GPU builds to start failing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test/native_test_launcher.cc
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc
index 0f880a741a66933441dccc7ff548ce7bbccf66e3..eb652d99aada72cabf9d08db10ceda4d34548f0d 100644
--- a/testing/android/native_test/native_test_launcher.cc
+++ b/testing/android/native_test/native_test_launcher.cc
@@ -75,6 +75,10 @@ static void RunTests(JNIEnv* env,
static const char* const kInitialArgv[] = { "ChromeTestActivity" };
base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
+ // Set the application context in base.
+ base::android::RegisterJni(env);
+ base::android::InitApplicationContext(env, app_context);
+
std::vector<std::string> args;
const std::string command_line_file_path(
@@ -129,9 +133,6 @@ static void RunTests(JNIEnv* env,
}
bool RegisterNativeTestJNI(JNIEnv* env) {
- if (!base::android::RegisterJni(env)) {
- return false;
- }
return RegisterNativesImpl(env);
}
« no previous file with comments | « testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698