| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/services/network/network_service_delegate.h" | 5 #include "mojo/services/network/network_service_delegate.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 uint32_t id) { | 90 uint32_t id) { |
| 91 shell_ = shell; | 91 shell_ = shell; |
| 92 | 92 |
| 93 #if !defined(OS_ANDROID) | 93 #if !defined(OS_ANDROID) |
| 94 // TODO(erg): The following doesn't work when running the android | 94 // TODO(erg): The following doesn't work when running the android |
| 95 // apptests. It works in the mandoline shell (on desktop and on android), and | 95 // apptests. It works in the mandoline shell (on desktop and on android), and |
| 96 // in the apptests on desktop. However, on android, whenever we make the call | 96 // in the apptests on desktop. However, on android, whenever we make the call |
| 97 // to OpenFileSystem, the entire mojo system hangs to the point where writes | 97 // to OpenFileSystem, the entire mojo system hangs to the point where writes |
| 98 // to stderr that previously would have printed to our console aren't. The | 98 // to stderr that previously would have printed to our console aren't. The |
| 99 // apptests are also fairly resistant to being run under gdb on android. | 99 // apptests are also fairly resistant to being run under gdb on android. |
| 100 shell_->ConnectToService("mojo:filesystem", &files_); | 100 shell_->ConnectToInterface("mojo:filesystem", &files_); |
| 101 | 101 |
| 102 filesystem::FileError error = filesystem::FileError::FAILED; | 102 filesystem::FileError error = filesystem::FileError::FAILED; |
| 103 filesystem::DirectoryPtr directory; | 103 filesystem::DirectoryPtr directory; |
| 104 files_->OpenFileSystem("origin", GetProxy(&directory), | 104 files_->OpenFileSystem("origin", GetProxy(&directory), |
| 105 binding_.CreateInterfacePtrAndBind(), Capture(&error)); | 105 binding_.CreateInterfacePtrAndBind(), Capture(&error)); |
| 106 files_.WaitForIncomingResponse(); | 106 files_.WaitForIncomingResponse(); |
| 107 | 107 |
| 108 io_worker_thread_.reset(new SQLThread(std::move(directory))); | 108 io_worker_thread_.reset(new SQLThread(std::move(directory))); |
| 109 #endif | 109 #endif |
| 110 | 110 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_, | 192 FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_, |
| 193 OnIOWorkerThreadShutdown()); | 193 OnIOWorkerThreadShutdown()); |
| 194 | 194 |
| 195 // Destroy the io worker thread here so that we can commit any pending | 195 // Destroy the io worker thread here so that we can commit any pending |
| 196 // cookies here. | 196 // cookies here. |
| 197 io_worker_thread_.reset(); | 197 io_worker_thread_.reset(); |
| 198 } | 198 } |
| 199 } | 199 } |
| 200 | 200 |
| 201 } // namespace mojo | 201 } // namespace mojo |
| OLD | NEW |