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

Unified Diff: gpu/ipc/service/gpu_channel_test_common.h

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « gpu/ipc/service/gpu_channel_manager.cc ('k') | gpu/ipc/service/gpu_channel_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_channel_test_common.h
diff --git a/gpu/ipc/service/gpu_channel_test_common.h b/gpu/ipc/service/gpu_channel_test_common.h
index 70918b845cf729a8bb5f9dd0e3d00c2f98d760b9..a92045ee0352c100b025659a743c1d7c73d081c4 100644
--- a/gpu/ipc/service/gpu_channel_test_common.h
+++ b/gpu/ipc/service/gpu_channel_test_common.h
@@ -4,7 +4,8 @@
#include <stdint.h>
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "gpu/command_buffer/service/gpu_preferences.h"
#include "gpu/ipc/service/gpu_channel.h"
#include "gpu/ipc/service/gpu_channel_manager.h"
@@ -75,7 +76,7 @@ class TestGpuChannelManager : public GpuChannelManager {
~TestGpuChannelManager() override;
protected:
- scoped_ptr<GpuChannel> CreateGpuChannel(
+ std::unique_ptr<GpuChannel> CreateGpuChannel(
int client_id,
uint64_t client_tracing_id,
bool preempts,
@@ -127,9 +128,9 @@ class GpuChannelTestCommon : public testing::Test {
GpuPreferences gpu_preferences_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
scoped_refptr<base::TestSimpleTaskRunner> io_task_runner_;
- scoped_ptr<SyncPointManager> sync_point_manager_;
- scoped_ptr<TestGpuChannelManagerDelegate> channel_manager_delegate_;
- scoped_ptr<GpuChannelManager> channel_manager_;
+ std::unique_ptr<SyncPointManager> sync_point_manager_;
+ std::unique_ptr<TestGpuChannelManagerDelegate> channel_manager_delegate_;
+ std::unique_ptr<GpuChannelManager> channel_manager_;
};
} // namespace gpu
« no previous file with comments | « gpu/ipc/service/gpu_channel_manager.cc ('k') | gpu/ipc/service/gpu_channel_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698