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

Unified Diff: base/test/multiprocess_test_android.cc

Issue 2784353002: Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Fix tests Created 3 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: base/test/multiprocess_test_android.cc
diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc
index a1b8fcbfc00c564eb73075caf685d1fd5c9210a2..f5025527298d70b4861f9690b897fcfb95343928 100644
--- a/base/test/multiprocess_test_android.cc
+++ b/base/test/multiprocess_test_android.cc
@@ -7,7 +7,6 @@
#include <string.h>
#include <vector>
-#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/scoped_java_ref.h"
@@ -54,7 +53,7 @@ SpawnChildResult SpawnMultiProcessTestChild(
android::ScopedJavaLocalRef<jobjectArray> j_argv =
android::ToJavaArrayOfStrings(env, command_line.argv());
jint pid = android::Java_MultiprocessTestClientLauncher_launchClient(
- env, android::GetApplicationContext(), j_argv, fds);
+ env, j_argv, fds);
SpawnChildResult result;
result.process = Process(pid);
@@ -69,8 +68,7 @@ bool WaitForMultiprocessTestChildExit(const Process& process,
base::android::ScopedJavaLocalRef<jobject> result_code =
android::Java_MultiprocessTestClientLauncher_waitForMainToReturn(
- env, android::GetApplicationContext(), process.Pid(),
- static_cast<int32_t>(timeout.InMilliseconds()));
+ env, process.Pid(), static_cast<int32_t>(timeout.InMilliseconds()));
if (result_code.is_null() ||
Java_MainReturnCodeResult_hasTimedOut(env, result_code)) {
return false;
@@ -88,7 +86,7 @@ bool TerminateMultiProcessTestChild(const Process& process,
DCHECK(env);
return android::Java_MultiprocessTestClientLauncher_terminate(
- env, android::GetApplicationContext(), process.Pid(), exit_code, wait);
+ env, process.Pid(), exit_code, wait);
}
} // namespace base
« no previous file with comments | « base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java ('k') | base/test/test_file_util_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698