| 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 "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/files/file_util.h" | 6 #include "base/files/file_util.h" |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| 11 #include "mojo/application_manager/application_loader.h" | |
| 12 #include "mojo/application_manager/application_manager.h" | |
| 13 #include "mojo/common/common_type_converters.h" | 11 #include "mojo/common/common_type_converters.h" |
| 14 #include "mojo/public/interfaces/application/application.mojom.h" | 12 #include "mojo/public/interfaces/application/application.mojom.h" |
| 15 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 13 #include "mojo/public/interfaces/application/service_provider.mojom.h" |
| 16 #include "mojo/public/interfaces/application/shell.mojom.h" | 14 #include "mojo/public/interfaces/application/shell.mojom.h" |
| 15 #include "shell/application_manager/application_loader.h" |
| 16 #include "shell/application_manager/application_manager.h" |
| 17 #include "shell/domain_socket/net_errors.h" | 17 #include "shell/domain_socket/net_errors.h" |
| 18 #include "shell/domain_socket/test_completion_callback.h" | 18 #include "shell/domain_socket/test_completion_callback.h" |
| 19 #include "shell/domain_socket/unix_domain_client_socket_posix.h" | 19 #include "shell/domain_socket/unix_domain_client_socket_posix.h" |
| 20 #include "shell/external_application_listener_posix.h" | 20 #include "shell/external_application_listener_posix.h" |
| 21 #include "shell/external_application_registrar.mojom.h" | 21 #include "shell/external_application_registrar.mojom.h" |
| 22 #include "shell/external_application_registrar_connection.h" | 22 #include "shell/external_application_registrar_connection.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 #include "url/gurl.h" | 24 #include "url/gurl.h" |
| 25 | 25 |
| 26 namespace mojo { | 26 namespace mojo { |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 run_loop_.Run(); | 246 run_loop_.Run(); |
| 247 | 247 |
| 248 // The apps need to be destroyed on the thread where they did socket stuff. | 248 // The apps need to be destroyed on the thread where they did socket stuff. |
| 249 io_thread_.task_runner()->PostTask( | 249 io_thread_.task_runner()->PostTask( |
| 250 FROM_HERE, base::Bind(&DestroyOnIOThread, base::Passed(&supersweet_app), | 250 FROM_HERE, base::Bind(&DestroyOnIOThread, base::Passed(&supersweet_app), |
| 251 base::Passed(&awesome_app))); | 251 base::Passed(&awesome_app))); |
| 252 } | 252 } |
| 253 | 253 |
| 254 } // namespace shell | 254 } // namespace shell |
| 255 } // namespace mojo | 255 } // namespace mojo |
| OLD | NEW |