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

remoting/protocol/pairing_registry_unittest.cc

 // Copyright (c) 2012 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 "remoting/protocol/pairing_registry.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 74 matching lines @@
  protected:
   base::MessageLoop message_loop_;
   base::RunLoop run_loop_;
 
   int callback_count_;
   std::unique_ptr<base::ListValue> pairings_;
 };
 
 TEST_F(PairingRegistryTest, CreateAndGetPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      base::WrapUnique(new MockPairingRegistryDelegate()));
+      base::MakeUnique<MockPairingRegistryDelegate>());
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("my_client");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("my_client");
 
   EXPECT_NE(pairing_1.shared_secret(), pairing_2.shared_secret());
 
   registry->GetPairing(pairing_1.client_id(),
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_1.shared_secret()));
   EXPECT_EQ(1, callback_count_);
 
   // Check that the second client is paired with a different shared secret.
   registry->GetPairing(pairing_2.client_id(),
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_2.shared_secret()));
   EXPECT_EQ(2, callback_count_);
 }
 
 TEST_F(PairingRegistryTest, GetAllPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      base::WrapUnique(new MockPairingRegistryDelegate()));
+      base::MakeUnique<MockPairingRegistryDelegate>());
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
 
   ASSERT_EQ(2u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_1;
   const base::DictionaryValue* actual_pairing_2;
   ASSERT_TRUE(pairings_->GetDictionary(0, &actual_pairing_1));
   ASSERT_TRUE(pairings_->GetDictionary(1, &actual_pairing_2));
 
   // Ordering is not guaranteed, so swap if necessary.
   std::string actual_client_id;
   ASSERT_TRUE(actual_pairing_1->GetString(PairingRegistry::kClientIdKey,
                                           &actual_client_id));
   if (actual_client_id != pairing_1.client_id()) {
     std::swap(actual_pairing_1, actual_pairing_2);
   }
 
   VerifyPairing(pairing_1, *actual_pairing_1);
   VerifyPairing(pairing_2, *actual_pairing_2);
 }
 
 TEST_F(PairingRegistryTest, DeletePairing) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      base::WrapUnique(new MockPairingRegistryDelegate()));
+      base::MakeUnique<MockPairingRegistryDelegate>());
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
   registry->DeletePairing(
       pairing_1.client_id(),
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
                  base::Unretained(this)));
 
   // Re-read the list, and verify it only has the pairing_2 client.
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
 
   ASSERT_EQ(1u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_2;
   ASSERT_TRUE(pairings_->GetDictionary(0, &actual_pairing_2));
   std::string actual_client_id;
   ASSERT_TRUE(actual_pairing_2->GetString(PairingRegistry::kClientIdKey,
                                           &actual_client_id));
   EXPECT_EQ(pairing_2.client_id(), actual_client_id);
 }
 
 TEST_F(PairingRegistryTest, ClearAllPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      base::WrapUnique(new MockPairingRegistryDelegate()));
+      base::MakeUnique<MockPairingRegistryDelegate>());
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
   registry->ClearAllPairings(
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
                  base::Unretained(this)));
 
   // Re-read the list, and verify it is empty.
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
@@ skipping 30 matching lines @@
   EXPECT_CALL(callbacks, DoneCallback(true))
       .InSequence(s);
   EXPECT_CALL(callbacks, GetAllPairingsCallbackPtr(NoPairings()))
       .InSequence(s);
   EXPECT_CALL(callbacks, GetPairingCallback(EqualsClientName("client3")))
       .InSequence(s)
       .WillOnce(QuitMessageLoop(run_loop_.QuitClosure()));
 
   scoped_refptr<PairingRegistry> registry =
       new PairingRegistry(base::ThreadTaskRunnerHandle::Get(),
-                          base::WrapUnique(new MockPairingRegistryDelegate()));
+                          base::MakeUnique<MockPairingRegistryDelegate>());
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
   registry->GetPairing(
       pairing_1.client_id(),
       base::Bind(&MockPairingRegistryCallbacks::GetPairingCallback,
                  base::Unretained(&callbacks)));
   registry->GetPairing(
       pairing_2.client_id(),
       base::Bind(&MockPairingRegistryCallbacks::GetPairingCallback,
                  base::Unretained(&callbacks)));
@@ skipping 19 matching lines @@
   registry->GetPairing(
       pairing_3.client_id(),
       base::Bind(&MockPairingRegistryCallbacks::GetPairingCallback,
                  base::Unretained(&callbacks)));
 
   run_loop_.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting