| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 // apptests. It works in the mandoline shell (on desktop and on android), and | 94 // apptests. It works in the mandoline shell (on desktop and on android), and |
| 95 // in the apptests on desktop. However, on android, whenever we make the call | 95 // in the apptests on desktop. However, on android, whenever we make the call |
| 96 // to OpenFileSystem, the entire mojo system hangs to the point where writes | 96 // to OpenFileSystem, the entire mojo system hangs to the point where writes |
| 97 // to stderr that previously would have printed to our console aren't. The | 97 // to stderr that previously would have printed to our console aren't. The |
| 98 // apptests are also fairly resistant to being run under gdb on android. | 98 // apptests are also fairly resistant to being run under gdb on android. |
| 99 app_->ConnectToService("mojo:filesystem", &files_); | 99 app_->ConnectToService("mojo:filesystem", &files_); |
| 100 | 100 |
| 101 filesystem::FileSystemClientPtr client; | 101 filesystem::FileSystemClientPtr client; |
| 102 binding_.Bind(GetProxy(&client)); | 102 binding_.Bind(GetProxy(&client)); |
| 103 | 103 |
| 104 filesystem::FileError error = filesystem::FILE_ERROR_FAILED; | 104 filesystem::FileError error = filesystem::FileError::FAILED; |
| 105 filesystem::DirectoryPtr directory; | 105 filesystem::DirectoryPtr directory; |
| 106 files_->OpenFileSystem("origin", GetProxy(&directory), std::move(client), | 106 files_->OpenFileSystem("origin", GetProxy(&directory), std::move(client), |
| 107 Capture(&error)); | 107 Capture(&error)); |
| 108 files_.WaitForIncomingResponse(); | 108 files_.WaitForIncomingResponse(); |
| 109 | 109 |
| 110 io_worker_thread_.reset(new SQLThread(std::move(directory))); | 110 io_worker_thread_.reset(new SQLThread(std::move(directory))); |
| 111 #endif | 111 #endif |
| 112 | 112 |
| 113 // TODO(erg): Find everything else that writes to the filesystem and | 113 // TODO(erg): Find everything else that writes to the filesystem and |
| 114 // transition it to proxying mojo:filesystem. We shouldn't have any path | 114 // transition it to proxying mojo:filesystem. We shouldn't have any path |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_, | 198 FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_, |
| 199 OnIOWorkerThreadShutdown()); | 199 OnIOWorkerThreadShutdown()); |
| 200 | 200 |
| 201 // Destroy the io worker thread here so that we can commit any pending | 201 // Destroy the io worker thread here so that we can commit any pending |
| 202 // cookies here. | 202 // cookies here. |
| 203 io_worker_thread_.reset(); | 203 io_worker_thread_.reset(); |
| 204 } | 204 } |
| 205 } | 205 } |
| 206 | 206 |
| 207 } // namespace mojo | 207 } // namespace mojo |
| OLD | NEW |