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

Unified Diff: mojo/edk/system/ipc_support.h

Issue 1350503005: EDK: Some more scoped_ptr -> std::unique_ptr conversions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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 | « mojo/edk/system/data_pipe_impl_unittest.cc ('k') | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/ipc_support.h
diff --git a/mojo/edk/system/ipc_support.h b/mojo/edk/system/ipc_support.h
index 33441fbc66e7cb3353beadf5c0e7d77fac49e6c6..d32f8f2d75e756946963168b9aec56b481d925d3 100644
--- a/mojo/edk/system/ipc_support.h
+++ b/mojo/edk/system/ipc_support.h
@@ -5,10 +5,11 @@
#ifndef MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
#define MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
+#include <memory>
+
#include "base/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/task_runner.h"
#include "mojo/edk/embedder/process_type.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
@@ -169,8 +170,8 @@ class MOJO_SYSTEM_IMPL_EXPORT IPCSupport {
embedder::ProcessDelegate* process_delegate_;
scoped_refptr<base::TaskRunner> io_thread_task_runner_;
- scoped_ptr<ConnectionManager> connection_manager_;
- scoped_ptr<ChannelManager> channel_manager_;
+ std::unique_ptr<ConnectionManager> connection_manager_;
+ std::unique_ptr<ChannelManager> channel_manager_;
MOJO_DISALLOW_COPY_AND_ASSIGN(IPCSupport);
};
« no previous file with comments | « mojo/edk/system/data_pipe_impl_unittest.cc ('k') | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698