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

components/user_prefs/tracked/segregated_pref_store_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 "components/user_prefs/tracked/segregated_pref_store.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 86 matching lines @@
  private:
   std::unique_ptr<MockReadErrorDelegate> read_error_delegate_;
 };
 
 TEST_F(SegregatedPrefStoreTest, StoreValues) {
   ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
             segregated_store_->ReadPrefs());
 
   // Properly stores new values.
   segregated_store_->SetValue(kSelectedPref,
-                              base::WrapUnique(new base::StringValue(kValue1)),
+                              base::MakeUnique<base::StringValue>(kValue1),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   segregated_store_->SetValue(kUnselectedPref,
-                              base::WrapUnique(new base::StringValue(kValue2)),
+                              base::MakeUnique<base::StringValue>(kValue2),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   ASSERT_TRUE(selected_store_->GetValue(kSelectedPref, NULL));
   ASSERT_FALSE(selected_store_->GetValue(kUnselectedPref, NULL));
   ASSERT_FALSE(default_store_->GetValue(kSelectedPref, NULL));
   ASSERT_TRUE(default_store_->GetValue(kUnselectedPref, NULL));
 
   ASSERT_TRUE(segregated_store_->GetValue(kSelectedPref, NULL));
   ASSERT_TRUE(segregated_store_->GetValue(kUnselectedPref, NULL));
 
   ASSERT_FALSE(selected_store_->committed());
   ASSERT_FALSE(default_store_->committed());
 
   segregated_store_->CommitPendingWrite();
 
   ASSERT_TRUE(selected_store_->committed());
   ASSERT_TRUE(default_store_->committed());
 }
 
 TEST_F(SegregatedPrefStoreTest, ReadValues) {
   selected_store_->SetValue(kSelectedPref,
-                            base::WrapUnique(new base::StringValue(kValue1)),
+                            base::MakeUnique<base::StringValue>(kValue1),
                             WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   default_store_->SetValue(kUnselectedPref,
-                           base::WrapUnique(new base::StringValue(kValue2)),
+                           base::MakeUnique<base::StringValue>(kValue2),
                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   // Works properly with values that are already there.
   ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
             segregated_store_->ReadPrefs());
   ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
             segregated_store_->GetReadError());
 
   ASSERT_TRUE(selected_store_->GetValue(kSelectedPref, NULL));
   ASSERT_FALSE(selected_store_->GetValue(kUnselectedPref, NULL));
   ASSERT_FALSE(default_store_->GetValue(kSelectedPref, NULL));
   ASSERT_TRUE(default_store_->GetValue(kUnselectedPref, NULL));
 
   ASSERT_TRUE(segregated_store_->GetValue(kSelectedPref, NULL));
   ASSERT_TRUE(segregated_store_->GetValue(kUnselectedPref, NULL));
 }
 
 TEST_F(SegregatedPrefStoreTest, Observer) {
   EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
             segregated_store_->ReadPrefs());
   EXPECT_TRUE(observer_.initialized);
   EXPECT_TRUE(observer_.initialization_success);
   EXPECT_TRUE(observer_.changed_keys.empty());
   segregated_store_->SetValue(kSelectedPref,
-                              base::WrapUnique(new base::StringValue(kValue1)),
+                              base::MakeUnique<base::StringValue>(kValue1),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   observer_.VerifyAndResetChangedKey(kSelectedPref);
   segregated_store_->SetValue(kUnselectedPref,
-                              base::WrapUnique(new base::StringValue(kValue2)),
+                              base::MakeUnique<base::StringValue>(kValue2),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   observer_.VerifyAndResetChangedKey(kUnselectedPref);
 }
 
 TEST_F(SegregatedPrefStoreTest, SelectedPrefReadNoFileError) {
   // PREF_READ_ERROR_NO_FILE for the selected prefs file is silently converted
   // to PREF_READ_ERROR_NONE.
   selected_store_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NO_FILE);
   EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE,
             segregated_store_->ReadPrefs());
@@ skipping 92 matching lines @@
   selected_store_->SetBlockAsyncRead(true);
   default_store_->SetBlockAsyncRead(true);
   EXPECT_FALSE(segregated_store_->IsInitializationComplete());
   segregated_store_->ReadPrefsAsync(NULL);
   EXPECT_FALSE(segregated_store_->IsInitializationComplete());
   selected_store_->SetBlockAsyncRead(false);
   EXPECT_FALSE(segregated_store_->IsInitializationComplete());
   default_store_->SetBlockAsyncRead(false);
   EXPECT_TRUE(segregated_store_->IsInitializationComplete());
 }