Update content module for IPC attachment brokering.

content/common/gpu/gpu_channel_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 class SyncPointManager;
 union ValueState;
 namespace gles2 {
 class MailboxManager;
 class ProgramCache;
 class ShaderTranslatorCache;
 }
 }
 
 namespace IPC {
+class AttachmentBroker;
 struct ChannelHandle;
 class SyncChannel;
 class MessageFilter;
 }
 
 struct GPUCreateCommandBufferConfig;
 
 namespace content {
 class GpuChannel;
 class GpuMemoryBufferFactory;
 class GpuWatchdog;
 class MessageRouter;
 
 // A GpuChannelManager is a thread responsible for issuing rendering commands
 // managing the lifetimes of GPU channels and forwarding IPC requests from the
 // browser process to them based on the corresponding renderer ID.
 class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
                           public IPC::Sender {
  public:
+  // |broker| must outlive GpuChannelManager and any channels it creates.
   GpuChannelManager(MessageRouter* router,
                     GpuWatchdog* watchdog,
                     base::SingleThreadTaskRunner* io_task_runner,
                     base::WaitableEvent* shutdown_event,
-                    IPC::SyncChannel* channel);
+                    IPC::SyncChannel* channel,
+                    IPC::AttachmentBroker* broker);
   ~GpuChannelManager() override;
 
   // Remove the channel for a particular renderer.
   void RemoveChannel(int client_id);
 
   // Listener overrides.
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   // Sender overrides.
   bool Send(IPC::Message* msg) override;
@@ skipping 72 matching lines @@
   GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
   scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
   scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
   IPC::SyncChannel* channel_;
   scoped_refptr<IPC::MessageFilter> filter_;
   bool relinquish_resources_pending_;
+  // Must outlive this instance of GpuChannelManager.
+  IPC::AttachmentBroker* attachment_broker_;
 
   // Member variables should appear before the WeakPtrFactory, to ensure
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<GpuChannelManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_