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

components/sync/model/fake_model_type_service.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 "components/sync/model/fake_model_type_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 289 matching lines @@
 
 ConflictResolution FakeModelTypeService::ResolveConflict(
     const EntityData& local_data,
     const EntityData& remote_data) const {
   DCHECK(conflict_resolution_);
   return std::move(*conflict_resolution_);
 }
 
 void FakeModelTypeService::SetConflictResolution(
     ConflictResolution resolution) {
-  conflict_resolution_.reset(new ConflictResolution(std::move(resolution)));
+  conflict_resolution_ =
+      base::MakeUnique<ConflictResolution>(std::move(resolution));
 }
 
 void FakeModelTypeService::SetServiceError(SyncError::ErrorType error_type) {
   DCHECK(!service_error_.IsSet());
   service_error_ = SyncError(FROM_HERE, error_type, "TestError", PREFERENCES);
 }
 
 void FakeModelTypeService::CheckPostConditions() {
   DCHECK(!service_error_.IsSet());
 }
 
 }  // namespace syncer