[Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead.

chrome/browser/sync/test/integration/sync_arc_package_helper.cc

 // Copyright 2016 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 "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
 
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ skipping 40 matching lines @@
 
 SyncArcPackageHelper::~SyncArcPackageHelper() {}
 
 void SyncArcPackageHelper::SetupTest(SyncTest* test) {
   if (setup_completed_) {
     DCHECK_EQ(test, test_);
     return;
   }
   test_ = test;
 
-  user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
-      new chromeos::FakeChromeUserManager()));
+  user_manager_enabler_ = base::MakeUnique<chromeos::ScopedUserManagerEnabler>(
+      new chromeos::FakeChromeUserManager());
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   ArcAppListPrefsFactory::SetFactoryForSyncTest();
   size_t id = 0;
   for (auto* profile : test_->GetAllProfiles())
     SetupArcService(profile, id++);
   setup_completed_ = true;
 }
 
 void SyncArcPackageHelper::CleanUp() {
@@ skipping 77 matching lines @@
   auth_service->OnPrimaryUserProfilePrepared(profile);
   auth_service->EnableArc();
 
   ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
   DCHECK(arc_app_list_prefs);
 
   base::RunLoop run_loop;
   arc_app_list_prefs->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
   run_loop.Run();
 
-  instance_map_[profile].reset(new FakeAppInstance(arc_app_list_prefs));
+  instance_map_[profile] =
+      base::MakeUnique<FakeAppInstance>(arc_app_list_prefs);
   DCHECK(instance_map_[profile].get());
   arc_app_list_prefs->app_instance_holder()->SetInstance(
       instance_map_[profile].get());
   // OnPackageListRefreshed will be called when AppInstance is ready.
   // For fakeAppInstance we use SendRefreshPackageList to make sure that
   // OnPackageListRefreshed will be called.
   instance_map_[profile]->SendRefreshPackageList(
       std::vector<arc::mojom::ArcPackageInfo>());
 }
 
@@ skipping 69 matching lines @@
     if (package1_info->last_backup_android_id !=
         package2_info->last_backup_android_id)
       return false;
     if (package1_info->last_backup_time != package2_info->last_backup_time)
       return false;
   }
   return true;
 }
 
 }  // namespace arc