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

Unified Diff: mojo/edk/system/slave_connection_manager.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/raw_channel_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/slave_connection_manager.h
diff --git a/mojo/edk/system/slave_connection_manager.h b/mojo/edk/system/slave_connection_manager.h
index 664c8dd80f659d8f47426551596a93bde76d6687..b7daf0cc43da4382bce1ab3dea4382e567edc4ca 100644
--- a/mojo/edk/system/slave_connection_manager.h
+++ b/mojo/edk/system/slave_connection_manager.h
@@ -5,8 +5,9 @@
#ifndef MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
#define MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
+#include <memory>
+
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
@@ -106,7 +107,7 @@ class MOJO_SYSTEM_IMPL_EXPORT SlaveConnectionManager final
base::Thread private_thread_;
// Only accessed on |private_thread_|:
- scoped_ptr<RawChannel> raw_channel_;
+ std::unique_ptr<RawChannel> raw_channel_;
enum AwaitingAckType {
NOT_AWAITING_ACK,
AWAITING_ACCEPT_CONNECT_ACK,
« no previous file with comments | « mojo/edk/system/raw_channel_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698