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

mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc

 // 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.
 
 #include "mojo/edk/embedder/simple_platform_shared_buffer.h"
 
 #include <limits>
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace embedder {
 namespace {
 
 TEST(SimplePlatformSharedBufferTest, Basic) {
   const size_t kNumInts = 100;
   const size_t kNumBytes = kNumInts * sizeof(int);
   // A fudge so that we're not just writing zero bytes 75% of the time.
   const int kFudge = 1234567890;
 
   // Make some memory.
   scoped_refptr<SimplePlatformSharedBuffer> buffer(
       SimplePlatformSharedBuffer::Create(kNumBytes));
   ASSERT_TRUE(buffer);
 
   // Map it all, scribble some stuff, and then unmap it.
   {
     EXPECT_TRUE(buffer->IsValidMap(0, kNumBytes));
-    scoped_ptr<PlatformSharedBufferMapping> mapping(buffer->Map(0, kNumBytes));
+    std::unique_ptr<PlatformSharedBufferMapping> mapping(
+        buffer->Map(0, kNumBytes));
     ASSERT_TRUE(mapping);
     ASSERT_TRUE(mapping->GetBase());
     int* stuff = static_cast<int*>(mapping->GetBase());
     for (size_t i = 0; i < kNumInts; i++)
       stuff[i] = static_cast<int>(i) + kFudge;
   }
 
   // Map it all again, check that our scribbling is still there, then do a
   // partial mapping and scribble on that, check that everything is coherent,
   // unmap the first mapping, scribble on some of the second mapping, and then
   // unmap it.
   {
     ASSERT_TRUE(buffer->IsValidMap(0, kNumBytes));
     // Use |MapNoCheck()| this time.
-    scoped_ptr<PlatformSharedBufferMapping> mapping1(
+    std::unique_ptr<PlatformSharedBufferMapping> mapping1(
         buffer->MapNoCheck(0, kNumBytes));
     ASSERT_TRUE(mapping1);
     ASSERT_TRUE(mapping1->GetBase());
     int* stuff1 = static_cast<int*>(mapping1->GetBase());
     for (size_t i = 0; i < kNumInts; i++)
       EXPECT_EQ(static_cast<int>(i) + kFudge, stuff1[i]) << i;
 
-    scoped_ptr<PlatformSharedBufferMapping> mapping2(
+    std::unique_ptr<PlatformSharedBufferMapping> mapping2(
         buffer->Map((kNumInts / 2) * sizeof(int), 2 * sizeof(int)));
     ASSERT_TRUE(mapping2);
     ASSERT_TRUE(mapping2->GetBase());
     int* stuff2 = static_cast<int*>(mapping2->GetBase());
     EXPECT_EQ(static_cast<int>(kNumInts / 2) + kFudge, stuff2[0]);
     EXPECT_EQ(static_cast<int>(kNumInts / 2) + 1 + kFudge, stuff2[1]);
 
     stuff2[0] = 123;
     stuff2[1] = 456;
     EXPECT_EQ(123, stuff1[kNumInts / 2]);
     EXPECT_EQ(456, stuff1[kNumInts / 2 + 1]);
 
     mapping1.reset();
 
     EXPECT_EQ(123, stuff2[0]);
     EXPECT_EQ(456, stuff2[1]);
     stuff2[1] = 789;
   }
 
   // Do another partial mapping and check that everything is the way we expect
   // it to be.
   {
     EXPECT_TRUE(buffer->IsValidMap(sizeof(int), kNumBytes - sizeof(int)));
-    scoped_ptr<PlatformSharedBufferMapping> mapping(
+    std::unique_ptr<PlatformSharedBufferMapping> mapping(
         buffer->Map(sizeof(int), kNumBytes - sizeof(int)));
     ASSERT_TRUE(mapping);
     ASSERT_TRUE(mapping->GetBase());
     int* stuff = static_cast<int*>(mapping->GetBase());
 
     for (size_t j = 0; j < kNumInts - 1; j++) {
       int i = static_cast<int>(j) + 1;
       if (i == kNumInts / 2) {
         EXPECT_EQ(123, stuff[j]);
       } else if (i == kNumInts / 2 + 1) {
@@ skipping 47 matching lines @@
     EXPECT_FALSE(buffer->Map(0, kMaxSizeT));
 }
 
 // Tests that separate mappings get distinct addresses.
 // Note: It's not inconceivable that the OS could ref-count identical mappings
 // and reuse the same address, in which case we'd have to be more careful about
 // using the address as the key for unmapping.
 TEST(SimplePlatformSharedBufferTest, MappingsDistinct) {
   scoped_refptr<SimplePlatformSharedBuffer> buffer(
       SimplePlatformSharedBuffer::Create(100));
-  scoped_ptr<PlatformSharedBufferMapping> mapping1(buffer->Map(0, 100));
-  scoped_ptr<PlatformSharedBufferMapping> mapping2(buffer->Map(0, 100));
+  std::unique_ptr<PlatformSharedBufferMapping> mapping1(buffer->Map(0, 100));
+  std::unique_ptr<PlatformSharedBufferMapping> mapping2(buffer->Map(0, 100));
   EXPECT_NE(mapping1->GetBase(), mapping2->GetBase());
 }
 
 TEST(SimplePlatformSharedBufferTest, BufferZeroInitialized) {
   static const size_t kSizes[] = {10, 100, 1000, 10000, 100000};
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kSizes); i++) {
     scoped_refptr<SimplePlatformSharedBuffer> buffer(
         SimplePlatformSharedBuffer::Create(kSizes[i]));
-    scoped_ptr<PlatformSharedBufferMapping> mapping(buffer->Map(0, kSizes[i]));
+    std::unique_ptr<PlatformSharedBufferMapping> mapping(
+        buffer->Map(0, kSizes[i]));
     for (size_t j = 0; j < kSizes[i]; j++) {
       // "Assert" instead of "expect" so we don't spam the output with thousands
       // of failures if we fail.
       ASSERT_EQ('\0', static_cast<char*>(mapping->GetBase())[j])
           << "size " << kSizes[i] << ", offset " << j;
     }
   }
 }
 
 TEST(SimplePlatformSharedBufferTest, MappingsOutliveBuffer) {
-  scoped_ptr<PlatformSharedBufferMapping> mapping1;
-  scoped_ptr<PlatformSharedBufferMapping> mapping2;
+  std::unique_ptr<PlatformSharedBufferMapping> mapping1;
+  std::unique_ptr<PlatformSharedBufferMapping> mapping2;
 
   {
     scoped_refptr<SimplePlatformSharedBuffer> buffer(
         SimplePlatformSharedBuffer::Create(100));
-    mapping1 = buffer->Map(0, 100).Pass();
-    mapping2 = buffer->Map(50, 50).Pass();
+    mapping1 = buffer->Map(0, 100);
+    mapping2 = buffer->Map(50, 50);
     static_cast<char*>(mapping1->GetBase())[50] = 'x';
   }
 
   EXPECT_EQ('x', static_cast<char*>(mapping2->GetBase())[0]);
 
   static_cast<char*>(mapping2->GetBase())[1] = 'y';
   EXPECT_EQ('y', static_cast<char*>(mapping1->GetBase())[51]);
 }
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo