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

Unified Diff: mojo/runner/shell_test_base_android.cc

Issue 1343823002: Revert of 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
« no previous file with comments | « mojo/runner/shell_test_base.cc ('k') | mojo/runner/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 06a3d2f60163f2ad490f0ec887703424b0a6f00d..ded757bb0c9d0d99391618de62e184ba26ee5ce3 100644
--- a/mojo/runner/shell_test_base_android.cc
+++ b/mojo/runner/shell_test_base_android.cc
@@ -30,15 +30,16 @@
} // namespace
-base::FilePath ShellTestBase::GetTestAppFilePath() const {
+void ShellTestBase::SetUpTestApplications() {
// 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()));
- return base::FilePath(base::android::ConvertJavaStringToUTF8(
- env, service_dir.obj()));
+ shell_context_.url_resolver()->SetMojoBaseURL(
+ mojo::util::FilePathToFileURL(base::FilePath(
+ base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));
}
} // namespace test
« no previous file with comments | « mojo/runner/shell_test_base.cc ('k') | mojo/runner/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698