EDK: More scoped_ptr -> std::unique_ptr conversions.

mojo/edk/system/transport_data.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 #define MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 
 #include <stdint.h>
 
 #include <memory>
 #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"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
@@ skipping 57 matching lines @@
   // The maximum number of platform handles to attach for a single serialized
   // dispatcher.
   static const size_t kMaxSerializedDispatcherPlatformHandles = 2;
 
   // The maximum possible size of a valid transport data buffer.
   static size_t GetMaxBufferSize();
 
   // 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
   // |Dispatcher|s. (|Header| will be present, and zero except for
   // |num_platform_handles|, and |platform_handle_table_offset| if necessary.)
   explicit TransportData(
       embedder::ScopedPlatformHandleVectorPtr platform_handles,
       size_t serialized_platform_handle_size);
 
   ~TransportData();
@@ skipping 30 matching lines @@
 
   // Gets the platform handle table from a (valid) |TransportData| buffer (which
   // should have been validated using |ValidateBuffer()| first).
   static void GetPlatformHandleTable(const void* transport_data_buffer,
                                      size_t* num_platform_handles,
                                      const void** platform_handle_table);
 
   // 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,
       Channel* channel);
 
  private:
   // To allow us to make compile-assertions about |Header|, etc. in the .cc
   // file.
   struct PrivateStructForCompileAsserts;
 
@@ skipping 28 matching lines @@
   // TODO(vtl): With C++11, change it to a vector of |ScopedPlatformHandle|s.
   embedder::ScopedPlatformHandleVectorPtr platform_handles_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TransportData);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_