| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "mojo/runner/shell_test_base.h" | 5 #include "mojo/runner/shell_test_base.h" | 
| 6 | 6 | 
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" | 
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" | 
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" | 
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 23   static bool initialized = false; | 23   static bool initialized = false; | 
| 24   if (!initialized) { | 24   if (!initialized) { | 
| 25     RegisterNativesImpl(env); | 25     RegisterNativesImpl(env); | 
| 26     initialized = true; | 26     initialized = true; | 
| 27   } | 27   } | 
| 28   return env; | 28   return env; | 
| 29 } | 29 } | 
| 30 | 30 | 
| 31 }  // namespace | 31 }  // namespace | 
| 32 | 32 | 
| 33 base::FilePath ShellTestBase::GetTestAppFilePath() const { | 33 void ShellTestBase::SetUpTestApplications() { | 
| 34   // Extract mojo applications, and set the resolve base URL to the directory | 34   // Extract mojo applications, and set the resolve base URL to the directory | 
| 35   // containing those. | 35   // containing those. | 
| 36   JNIEnv* env = InitEnv(); | 36   JNIEnv* env = InitEnv(); | 
| 37   base::android::ScopedJavaLocalRef<jstring> service_dir( | 37   base::android::ScopedJavaLocalRef<jstring> service_dir( | 
| 38       Java_ShellTestBase_extractMojoApplications( | 38       Java_ShellTestBase_extractMojoApplications( | 
| 39           env, base::android::GetApplicationContext())); | 39           env, base::android::GetApplicationContext())); | 
| 40   return base::FilePath(base::android::ConvertJavaStringToUTF8( | 40   shell_context_.url_resolver()->SetMojoBaseURL( | 
| 41       env, service_dir.obj())); | 41       mojo::util::FilePathToFileURL(base::FilePath( | 
|  | 42           base::android::ConvertJavaStringToUTF8(env, service_dir.obj())))); | 
| 42 } | 43 } | 
| 43 | 44 | 
| 44 }  // namespace test | 45 }  // namespace test | 
| 45 }  // namespace runner | 46 }  // namespace runner | 
| 46 }  // namespace mojo | 47 }  // namespace mojo | 
| OLD | NEW | 
|---|