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

mojo/edk/system/mapping_table.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_MAPPING_TABLE_H_
 #define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
 
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSharedBufferMapping;
 }
 
@@ skipping 12 matching lines @@
 //
 // This class is NOT thread-safe; locking is left to |Core|.
 class MOJO_SYSTEM_IMPL_EXPORT MappingTable {
  public:
   MappingTable();
   ~MappingTable();
 
   // Tries to add a mapping. (Takes ownership of the mapping in all cases; on
   // failure, it will be destroyed.)
   MojoResult AddMapping(
-      scoped_ptr<embedder::PlatformSharedBufferMapping> mapping);
+      std::unique_ptr<embedder::PlatformSharedBufferMapping> mapping);
   MojoResult RemoveMapping(uintptr_t address);
 
  private:
   friend bool internal::ShutdownCheckNoLeaks(Core*);
 
+  // TODO(vtl): Should the value type be |std::unique_ptr|?
   using AddressToMappingMap =
       base::hash_map<uintptr_t, embedder::PlatformSharedBufferMapping*>;
   AddressToMappingMap address_to_mapping_map_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MappingTable);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_