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

Unified Diff: mojo/runner/shell_test_base_android.cc

Issue 1342503003: Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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: mojo/runner/shell_test_base_android.cc
diff --git a/mojo/runner/shell_test_base_android.cc b/mojo/runner/shell_test_base_android.cc
index ded757bb0c9d0d99391618de62e184ba26ee5ce3..06a3d2f60163f2ad490f0ec887703424b0a6f00d 100644
--- a/mojo/runner/shell_test_base_android.cc
+++ b/mojo/runner/shell_test_base_android.cc
@@ -30,16 +30,15 @@ JNIEnv* InitEnv() {
} // namespace
-void ShellTestBase::SetUpTestApplications() {
+base::FilePath ShellTestBase::GetTestAppFilePath() const {
// Extract mojo applications, and set the resolve base URL to the directory
// containing those.
JNIEnv* env = InitEnv();
base::android::ScopedJavaLocalRef<jstring> service_dir(
Java_ShellTestBase_extractMojoApplications(
env, base::android::GetApplicationContext()));
- shell_context_.url_resolver()->SetMojoBaseURL(
- mojo::util::FilePathToFileURL(base::FilePath(
- base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));
+ return base::FilePath(base::android::ConvertJavaStringToUTF8(
+ env, service_dir.obj()));
}
} // namespace test

Powered by Google App Engine
This is Rietveld 408576698