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

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

Issue 1350183002: EDK: More scoped_ptr -> std::unique_ptr conversions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: gah 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/shared_buffer_dispatcher_unittest.cc ('k') | mojo/edk/system/transport_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/transport_data.h
diff --git a/mojo/edk/system/transport_data.h b/mojo/edk/system/transport_data.h
index cc140e737a37bf29d1158ef97b86cf110e039565..295a5a136d5e5ec815668bf948cfd5ec1d792ad9 100644
--- a/mojo/edk/system/transport_data.h
+++ b/mojo/edk/system/transport_data.h
@@ -11,8 +11,6 @@
#include <vector>
#include "base/memory/aligned_memory.h"
-#include "base/memory/scoped_ptr.h"
-#include "build/build_config.h"
#include "mojo/edk/embedder/platform_handle.h"
#include "mojo/edk/embedder/platform_handle_vector.h"
#include "mojo/edk/system/dispatcher.h"
@@ -90,7 +88,8 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
// The maximum total number of platform handles that may be attached.
static size_t GetMaxPlatformHandles();
- TransportData(scoped_ptr<DispatcherVector> dispatchers, Channel* channel);
+ TransportData(std::unique_ptr<DispatcherVector> dispatchers,
+ Channel* channel);
// This is used for users of |MessageInTransit|/|TransportData|/|RawChannel|
// that want to simply transport data and platform handles, and not
@@ -141,7 +140,7 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
// Deserializes dispatchers from the given (serialized) transport data buffer
// (typically from a |MessageInTransit::View|) and vector of platform handles.
// |buffer| should be non-null and |buffer_size| should be nonzero.
- static scoped_ptr<DispatcherVector> DeserializeDispatchers(
+ static std::unique_ptr<DispatcherVector> DeserializeDispatchers(
const void* buffer,
size_t buffer_size,
embedder::ScopedPlatformHandleVectorPtr platform_handles,
« no previous file with comments | « mojo/edk/system/shared_buffer_dispatcher_unittest.cc ('k') | mojo/edk/system/transport_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698