OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef PPAPI_PROXY_PROXY_CHANNEL_H_ | 5 #ifndef PPAPI_PROXY_PROXY_CHANNEL_H_ |
6 #define PPAPI_PROXY_PROXY_CHANNEL_H_ | 6 #define PPAPI_PROXY_PROXY_CHANNEL_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/files/scoped_file.h" | 10 #include "base/files/scoped_file.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "base/memory/shared_memory.h" | 12 #include "base/memory/shared_memory.h" |
12 #include "base/process/process.h" | 13 #include "base/process/process.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "ipc/ipc_listener.h" | 15 #include "ipc/ipc_listener.h" |
15 #include "ipc/ipc_platform_file.h" | 16 #include "ipc/ipc_platform_file.h" |
16 #include "ipc/ipc_sender.h" | 17 #include "ipc/ipc_sender.h" |
17 #include "ipc/ipc_sync_channel.h" | 18 #include "ipc/ipc_sync_channel.h" |
18 #include "ppapi/proxy/ppapi_proxy_export.h" | 19 #include "ppapi/proxy/ppapi_proxy_export.h" |
19 | 20 |
20 namespace base { | 21 namespace base { |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 // "hello" message from the peer (which introduces a race condition). | 130 // "hello" message from the peer (which introduces a race condition). |
130 base::ProcessId peer_pid_; | 131 base::ProcessId peer_pid_; |
131 | 132 |
132 // When we're unit testing, this will indicate the sink for the messages to | 133 // When we're unit testing, this will indicate the sink for the messages to |
133 // be deposited so they can be inspected by the test. When non-NULL, this | 134 // be deposited so they can be inspected by the test. When non-NULL, this |
134 // indicates that the channel should not be used. | 135 // indicates that the channel should not be used. |
135 IPC::TestSink* test_sink_; | 136 IPC::TestSink* test_sink_; |
136 | 137 |
137 // Will be null for some tests when there is a test_sink_, and if the | 138 // Will be null for some tests when there is a test_sink_, and if the |
138 // remote side has crashed. | 139 // remote side has crashed. |
139 scoped_ptr<IPC::SyncChannel> channel_; | 140 std::unique_ptr<IPC::SyncChannel> channel_; |
140 | 141 |
141 DISALLOW_COPY_AND_ASSIGN(ProxyChannel); | 142 DISALLOW_COPY_AND_ASSIGN(ProxyChannel); |
142 }; | 143 }; |
143 | 144 |
144 } // namespace proxy | 145 } // namespace proxy |
145 } // namespace ppapi | 146 } // namespace ppapi |
146 | 147 |
147 #endif // PPAPI_PROXY_PROXY_CHANNEL_H_ | 148 #endif // PPAPI_PROXY_PROXY_CHANNEL_H_ |
OLD | NEW |