| Index: content/browser/gpu/browser_gpu_channel_host_factory.h
|
| diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| index 618e1c23d47fb83d4633b4cfe701811b0d4195b0..1dae42dfca71d86092035b0f6a517873f8556a3a 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| @@ -9,11 +9,11 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/gpu_process_launch_causes.h"
|
| @@ -33,7 +33,8 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| // Overridden from gpu::GpuChannelHostFactory:
|
| bool IsMainThread() override;
|
| scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
|
| - scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override;
|
| + std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
|
| + size_t size) override;
|
|
|
| int GpuProcessHostId() { return gpu_host_id_; }
|
| #if !defined(OS_ANDROID)
|
| @@ -64,9 +65,9 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
|
|
| const int gpu_client_id_;
|
| const uint64_t gpu_client_tracing_id_;
|
| - scoped_ptr<base::WaitableEvent> shutdown_event_;
|
| + std::unique_ptr<base::WaitableEvent> shutdown_event_;
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
|
| - scoped_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager_;
|
| + std::unique_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager_;
|
| int gpu_host_id_;
|
| scoped_refptr<EstablishRequest> pending_request_;
|
| std::vector<base::Closure> established_callbacks_;
|
|
|