Re-write many calls to WrapUnique() with MakeUnique()

chromecast/crash/linux/synchronized_minidump_manager_unittest.cc

 // Copyright 2015 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 "chromecast/crash/linux/synchronized_minidump_manager.h"
 
 #include <fcntl.h>
 #include <stdint.h>
 #include <stdio.h>  // perror
 #include <stdlib.h>
@@ skipping 228 matching lines @@
   ASSERT_TRUE(base::PathExists(lockfile_));
 }
 
 TEST_F(SynchronizedMinidumpManagerTest,
        AddEntryToLockFile_FailsWithInvalidEntry) {
   // Create invalid dump info value
   base::DictionaryValue val;
 
   // Test that the manager tried to log the entry and failed.
   SynchronizedMinidumpManagerSimple manager;
-  manager.SetDumpInfoToWrite(base::WrapUnique(new DumpInfo(&val)));
+  manager.SetDumpInfoToWrite(base::MakeUnique<DumpInfo>(&val));
   ASSERT_TRUE(manager.DoWorkLocked());
   ASSERT_FALSE(manager.add_entry_return_code());
 
   // Verify the lockfile is untouched.
   DumpList dumps;
   ASSERT_TRUE(FetchDumps(lockfile_.value(), &dumps));
   ASSERT_EQ(0u, dumps.size());
 }
 
 TEST_F(SynchronizedMinidumpManagerTest,
        AddEntryToLockFile_SucceedsWithValidEntries) {
   // Sample parameters.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   // Write the first entry.
   SynchronizedMinidumpManagerSimple manager;
   manager.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump1", "log1", now, params)));
+      base::MakeUnique<DumpInfo>("dump1", "log1", now, params));
   ASSERT_TRUE(manager.DoWorkLocked());
   ASSERT_TRUE(manager.add_entry_return_code());
 
   // Test that the manager was successful in logging the entry.
   DumpList dumps;
   ASSERT_TRUE(FetchDumps(lockfile_.value(), &dumps));
   ASSERT_EQ(1u, dumps.size());
 
   // Write the second entry.
   manager.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump2", "log2", now, params)));
+      base::MakeUnique<DumpInfo>("dump2", "log2", now, params));
   ASSERT_TRUE(manager.DoWorkLocked());
   ASSERT_TRUE(manager.add_entry_return_code());
 
   // Test that the second entry is also valid.
   ASSERT_TRUE(FetchDumps(lockfile_.value(), &dumps));
   ASSERT_EQ(2u, dumps.size());
 }
 
 TEST_F(SynchronizedMinidumpManagerTest, AcquireLockFile_WaitsForOtherThread) {
   // Create some parameters for a minidump.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   // Create a manager that grabs the lock then sleeps. Post a DoWork task to
   // another thread. |sleepy_manager| will grab the lock and hold it for
   // |sleep_time_ms|. It will then write a dump and release the lock.
   const int sleep_time_ms = 100;
   SleepySynchronizedMinidumpManagerSimple sleepy_manager(sleep_time_ms);
   sleepy_manager.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump", "log", now, params)));
+      base::MakeUnique<DumpInfo>("dump", "log", now, params));
   base::Thread sleepy_thread("sleepy");
   sleepy_thread.Start();
   sleepy_thread.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DoWorkLockedTask, base::Unretained(&sleepy_manager)));
 
   // Meanwhile, this thread should wait brielfy to allow the other thread to
   // grab the lock.
   const int concurrency_delay = 50;
   base::PlatformThread::Sleep(
       base::TimeDelta::FromMilliseconds(concurrency_delay));
 
   // |sleepy_manager| has the lock by now, but has not released it. Attempt to
   // grab it. DoWorkLocked() should block until |manager| has a chance to write
   // the dump.
   SynchronizedMinidumpManagerSimple manager;
   manager.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump", "log", now, params)));
+      base::MakeUnique<DumpInfo>("dump", "log", now, params));
 
   EXPECT_TRUE(manager.DoWorkLocked());
   EXPECT_TRUE(manager.add_entry_return_code());
   EXPECT_TRUE(manager.work_done());
 
   // Check that the other manager was also successful.
   EXPECT_TRUE(sleepy_manager.add_entry_return_code());
   EXPECT_TRUE(sleepy_manager.work_done());
 
   // Test that both entries were logged.
@@ skipping 52 matching lines @@
 TEST_F(SynchronizedMinidumpManagerTest,
        Upload_SucceedsWhenDumpLimitsNotExceeded) {
   // Sample parameters.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   FakeSynchronizedMinidumpUploader uploader;
   SynchronizedMinidumpManagerSimple producer;
   producer.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump1", "log1", now, params)));
+      base::MakeUnique<DumpInfo>("dump1", "log1", now, params));
 
   const int max_dumps = SynchronizedMinidumpManager::kRatelimitPeriodMaxDumps;
   produce_dumps(producer, max_dumps);
   consume_dumps(uploader, max_dumps);
 }
 
 TEST_F(SynchronizedMinidumpManagerTest, Upload_FailsWhenTooManyRecentDumps) {
   // Sample parameters.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   FakeSynchronizedMinidumpUploader uploader;
   SynchronizedMinidumpManagerSimple producer;
   producer.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump1", "log1", now, params)));
+      base::MakeUnique<DumpInfo>("dump1", "log1", now, params));
 
   const int max_dumps = SynchronizedMinidumpManager::kRatelimitPeriodMaxDumps;
   produce_dumps(producer, max_dumps + 1);
   consume_dumps(uploader, max_dumps);
 
   // Should fail with too many dumps
   ASSERT_TRUE(uploader.DoWorkLocked());
   ASSERT_FALSE(uploader.can_upload_return_val());
 }
 
 TEST_F(SynchronizedMinidumpManagerTest, UploadSucceedsAfterRateLimitPeriodEnd) {
   // Sample parameters.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   FakeSynchronizedMinidumpUploader uploader;
   SynchronizedMinidumpManagerSimple producer;
   producer.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump1", "log1", now, params)));
+      base::MakeUnique<DumpInfo>("dump1", "log1", now, params));
 
   const int iters = 3;
   const int max_dumps = SynchronizedMinidumpManager::kRatelimitPeriodMaxDumps;
 
   for (int i = 0; i < iters; ++i) {
     produce_dumps(producer, max_dumps + 1);
     consume_dumps(uploader, max_dumps);
 
     // Should fail with too many dumps
     ASSERT_TRUE(uploader.DoWorkLocked());
@@ skipping 25 matching lines @@
 TEST_F(SynchronizedMinidumpManagerTest, HasDumpsWithDumps) {
   // Sample parameters.
   base::Time now = base::Time::Now();
   MinidumpParams params;
   params.process_name = "process";
 
   SynchronizedMinidumpManagerSimple producer;
   FakeSynchronizedMinidumpUploader uploader;
 
   producer.SetDumpInfoToWrite(
-      base::WrapUnique(new DumpInfo("dump1", "log1", now, params)));
+      base::MakeUnique<DumpInfo>("dump1", "log1", now, params));
 
   const int kNumDumps = 3;
   for (int i = 0; i < kNumDumps; ++i) {
     produce_dumps(producer, 1);
     ASSERT_TRUE(uploader.HasDumps());
   }
 
   for (int i = 0; i < kNumDumps; ++i) {
     ASSERT_TRUE(uploader.HasDumps());
     consume_dumps(uploader, 1);
@@ skipping 10 matching lines @@
   const base::FilePath path =
       base::FilePath(manager.dump_path()).Append("hello123");
   const char kFileContents[] = "foobar";
   ASSERT_EQ(static_cast<int>(sizeof(kFileContents)),
             WriteFile(path, kFileContents, sizeof(kFileContents)));
 
   ASSERT_TRUE(manager.HasDumps());
 }
 
 }  // namespace chromecast