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

chrome/browser/sessions/persistent_tab_restore_service_unittest.cc

 // Copyright 2013 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/sessions/core/persistent_tab_restore_service.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 71 matching lines @@
   enum {
     kMaxEntries = sessions::TabRestoreServiceHelper::kMaxEntries,
   };
 
   // testing::Test:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     live_tab_ = base::WrapUnique(new sessions::ContentLiveTab(web_contents()));
     time_factory_ = new PersistentTabRestoreTimeFactory();
     service_.reset(new sessions::PersistentTabRestoreService(
-        base::WrapUnique(new ChromeTabRestoreServiceClient(profile())),
+        base::MakeUnique<ChromeTabRestoreServiceClient>(profile()),
         time_factory_));
   }
 
   void TearDown() override {
     service_->Shutdown();
     service_.reset();
     delete time_factory_;
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
@@ skipping 19 matching lines @@
     WebContentsTester::For(web_contents())->CommitPendingNavigation();
   }
 
   void RecreateService() {
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_->Shutdown();
     content::RunAllBlockingPoolTasksUntilIdle();
     service_.reset();
     service_.reset(new sessions::PersistentTabRestoreService(
-        base::WrapUnique(new ChromeTabRestoreServiceClient(profile())),
+        base::MakeUnique<ChromeTabRestoreServiceClient>(profile()),
         time_factory_));
     SynchronousLoadTabsFromLastSession();
   }
 
   // Adds a window with one tab and url to the profile's session service.
   // If |pinned| is true, the tab is marked as pinned in the session service.
   void AddWindowWithOneTabToSessionService(bool pinned) {
     SessionService* session_service =
         SessionServiceFactory::GetForProfile(profile());
     SessionID tab_id;
@@ skipping 641 matching lines @@
 
   EXPECT_FALSE(service_->IsLoaded());
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
   EXPECT_EQ(max_entries, service_->entries().size());
   SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   EXPECT_TRUE(service_->IsLoaded());
   service_->RemoveObserver(&observer);
 }