| Index: shell/android/android_handler.cc
|
| diff --git a/shell/android/android_handler.cc b/shell/android/android_handler.cc
|
| index 5b29ad75b8839f4ff64a81fb014ec74ea6774d2d..03c1284ffbf7497a5e7436f0d23b517975c10e06 100644
|
| --- a/shell/android/android_handler.cc
|
| +++ b/shell/android/android_handler.cc
|
| @@ -33,7 +33,7 @@ void RunAndroidApplication(JNIEnv* env,
|
| jobject j_context,
|
| const base::FilePath& app_path,
|
| jint j_handle) {
|
| - ScopedMessagePipeHandle handle((mojo::MessagePipeHandle(j_handle)));
|
| + ScopedMessagePipeHandle handle((MessagePipeHandle(j_handle)));
|
|
|
| // Load the library, so that we can set the application context there if
|
| // needed.
|
| @@ -63,7 +63,8 @@ void RunAndroidApplication(JNIEnv* env,
|
|
|
| // Run the application.
|
| base::ScopedNativeLibrary app_library_from_runner(
|
| - shell::DynamicServiceRunner::LoadAndRunService(app_path, handle.Pass()));
|
| + shell::DynamicServiceRunner::LoadAndRunService(
|
| + app_path, shell::DynamicServiceRunner::DeleteAppPath, handle.Pass()));
|
| }
|
| } // namespace
|
|
|
| @@ -80,7 +81,7 @@ void AndroidHandler::RunApplication(ShellPtr shell, URLResponsePtr response) {
|
| base::FilePath archive_path(
|
| ConvertJavaStringToUTF8(env, j_archive_path.obj()));
|
|
|
| - mojo::common::BlockingCopyToFile(response->body.Pass(), archive_path);
|
| + common::BlockingCopyToFile(response->body.Pass(), archive_path);
|
| RunAndroidApplicationFn run_android_application_fn = &RunAndroidApplication;
|
| Java_AndroidHandler_bootstrap(
|
| env, GetApplicationContext(), j_archive_path.obj(),
|
|
|