Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: content/browser/gpu/gpu_process_host.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_ipc_browsertests.cc ('k') | content/browser/gpu/shader_disk_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_process_host.h
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index 1d8053bd180c566409fc45980411edae23e77d64..1bbdb190a1ed002206818d1bb918651bbf954a6a 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <queue>
#include <set>
#include <string>
@@ -15,7 +16,6 @@
#include "base/callback.h"
#include "base/containers/hash_tables.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/time/time.h"
@@ -249,7 +249,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
// true.
gpu::GPUInfo gpu_info_;
- scoped_ptr<base::Thread> in_process_gpu_thread_;
+ std::unique_ptr<base::Thread> in_process_gpu_thread_;
// Whether we actually launched a GPU process.
bool process_launched_;
@@ -272,7 +272,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
static bool crashed_before_;
static int swiftshader_crash_count_;
- scoped_ptr<BrowserChildProcessHostImpl> process_;
+ std::unique_ptr<BrowserChildProcessHostImpl> process_;
// Track the URLs of the pages which have live offscreen contexts,
// assumed to be associated with untrusted content such as WebGL.
@@ -293,7 +293,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
// Browser-side Mojo endpoint which sets up a Mojo channel with the child
// process and contains the browser's ServiceRegistry.
- scoped_ptr<MojoApplicationHost> mojo_application_host_;
+ std::unique_ptr<MojoApplicationHost> mojo_application_host_;
DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
};
« no previous file with comments | « content/browser/gpu/gpu_ipc_browsertests.cc ('k') | content/browser/gpu/shader_disk_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698