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

mojo/edk/system/mapping_table.h

Index: mojo/edk/system/mapping_table.h
diff --git a/mojo/edk/system/mapping_table.h b/mojo/edk/system/mapping_table.h
index 5af16557c24d7d0d6b97a65ee88a6a23a0e19da6..f4e145f9c8d178517c5debcafc6a59634cadd2e2 100644
--- a/mojo/edk/system/mapping_table.h
+++ b/mojo/edk/system/mapping_table.h
@@ -7,10 +7,10 @@
 
 #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"
@@ -43,12 +43,13 @@ class MOJO_SYSTEM_IMPL_EXPORT 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_;