| Index: content/child/child_thread_impl.h
|
| diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h
|
| index 590c1ff3e8e01387fa6104bb6c17e8b5620201a9..a5bac150ea161df47b1f2e56fee93a398c80dc2f 100644
|
| --- a/content/child/child_thread_impl.h
|
| +++ b/content/child/child_thread_impl.h
|
| @@ -52,9 +52,12 @@ namespace blink {
|
| class WebFrame;
|
| } // namespace blink
|
|
|
| +namespace discardable_memory {
|
| +class ClientDiscardableSharedMemoryManager;
|
| +} // namespace discardable_memory
|
| +
|
| namespace content {
|
| class ChildMessageFilter;
|
| -class ChildDiscardableSharedMemoryManager;
|
| class ChildHistogramMessageFilter;
|
| class ChildResourceMessageFilter;
|
| class ChildSharedBitmapManager;
|
| @@ -142,8 +145,8 @@ class CONTENT_EXPORT ChildThreadImpl
|
| return shared_bitmap_manager_.get();
|
| }
|
|
|
| - ChildDiscardableSharedMemoryManager* discardable_shared_memory_manager()
|
| - const {
|
| + discardable_memory::ClientDiscardableSharedMemoryManager*
|
| + discardable_shared_memory_manager() const {
|
| return discardable_shared_memory_manager_.get();
|
| }
|
|
|
| @@ -244,6 +247,8 @@ class CONTENT_EXPORT ChildThreadImpl
|
| IPC::Sender* const sender_;
|
| };
|
|
|
| + class ClientDiscardableSharedMemoryManagerDelegate;
|
| +
|
| void Init(const Options& options);
|
|
|
| // We create the channel first without connecting it so we can add filters
|
| @@ -331,9 +336,12 @@ class CONTENT_EXPORT ChildThreadImpl
|
|
|
| std::unique_ptr<ChildSharedBitmapManager> shared_bitmap_manager_;
|
|
|
| - std::unique_ptr<ChildDiscardableSharedMemoryManager>
|
| + std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
|
| discardable_shared_memory_manager_;
|
|
|
| + std::unique_ptr<ClientDiscardableSharedMemoryManagerDelegate>
|
| + client_discardable_shared_memory_manager_delegate_;
|
| +
|
| std::unique_ptr<base::PowerMonitor> power_monitor_;
|
|
|
| scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner_;
|
|
|