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

components/sync/engine_impl/sync_manager_impl.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 "components/sync/engine_impl/sync_manager_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 222 matching lines @@
 
   AddObserver(&debug_info_event_listener_);
 
   database_path_ = args->database_location.Append(
       syncable::Directory::kSyncDatabaseFilename);
   report_unrecoverable_error_function_ =
       args->report_unrecoverable_error_function;
 
   allstatus_.SetHasKeystoreKey(
       !args->restored_keystore_key_for_bootstrapping.empty());
-  sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl(
+  sync_encryption_handler_ = base::MakeUnique<SyncEncryptionHandlerImpl>(
       &share_, args->encryptor, args->restored_key_for_bootstrapping,
-      args->restored_keystore_key_for_bootstrapping));
+      args->restored_keystore_key_for_bootstrapping);
   sync_encryption_handler_->AddObserver(this);
   sync_encryption_handler_->AddObserver(&debug_info_event_listener_);
   sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_);
 
   base::FilePath absolute_db_path = database_path_;
   DCHECK(absolute_db_path.IsAbsolute());
 
   std::unique_ptr<syncable::DirectoryBackingStore> backing_store =
       args->engine_components_factory->BuildDirectoryBackingStore(
           EngineComponentsFactory::STORAGE_ON_DISK,
           args->credentials.account_id, absolute_db_path);
 
   DCHECK(backing_store.get());
-  share_.directory.reset(new syncable::Directory(
+  share_.directory = base::MakeUnique<syncable::Directory>(
       backing_store.release(), args->unrecoverable_error_handler,
       report_unrecoverable_error_function_, sync_encryption_handler_.get(),
-      sync_encryption_handler_->GetCryptographerUnsafe()));
+      sync_encryption_handler_->GetCryptographerUnsafe());
   share_.sync_credentials = args->credentials;
 
   // UserShare is accessible to a lot of code that doesn't need access to the
   // sync token so clear sync_token from the UserShare.
   share_.sync_credentials.sync_token = "";
 
   DVLOG(1) << "Username: " << args->credentials.email;
   DVLOG(1) << "AccountId: " << args->credentials.account_id;
   if (!OpenDirectory(args->credentials.account_id)) {
     NotifyInitializationFailure();
     LOG(ERROR) << "Sync manager initialization failed!";
     return;
   }
 
   // Now that we have opened the Directory we can restore any previously saved
   // nigori specifics.
   if (args->saved_nigori_state) {
     sync_encryption_handler_->RestoreNigori(*args->saved_nigori_state);
     args->saved_nigori_state.reset();
   }
 
-  connection_manager_.reset(new SyncServerConnectionManager(
+  connection_manager_ = base::MakeUnique<SyncServerConnectionManager>(
       args->service_url.host() + args->service_url.path(),
       args->service_url.EffectiveIntPort(),
       args->service_url.SchemeIsCryptographic(), args->post_factory.release(),
-      args->cancelation_signal));
+      args->cancelation_signal);
   connection_manager_->set_client_id(directory()->cache_guid());
   connection_manager_->AddListener(this);
 
   std::string sync_id = directory()->cache_guid();
 
   DVLOG(1) << "Setting sync client ID: " << sync_id;
   allstatus_.SetSyncId(sync_id);
   DVLOG(1) << "Setting invalidator client ID: " << args->invalidator_client_id;
   allstatus_.SetInvalidatorClientId(args->invalidator_client_id);
 
-  model_type_registry_.reset(
-      new ModelTypeRegistry(args->workers, directory(), this));
+  model_type_registry_ =
+      base::MakeUnique<ModelTypeRegistry>(args->workers, directory(), this);
   sync_encryption_handler_->AddObserver(model_type_registry_.get());
 
   // Build a SyncCycleContext and store the worker in it.
   DVLOG(1) << "Sync is bringing up SyncCycleContext.";
   std::vector<SyncEngineEventListener*> listeners;
   listeners.push_back(&allstatus_);
   listeners.push_back(this);
   cycle_context_ = args->engine_components_factory->BuildContext(
       connection_manager_.get(), directory(), args->extensions_activity,
       listeners, &debug_info_event_listener_, model_type_registry_.get(),
@@ skipping 684 matching lines @@
 }
 
 void SyncManagerImpl::OnCookieJarChanged(bool account_mismatch,
                                          bool empty_jar) {
   DCHECK(thread_checker_.CalledOnValidThread());
   cycle_context_->set_cookie_jar_mismatch(account_mismatch);
   cycle_context_->set_cookie_jar_empty(empty_jar);
 }
 
 }  // namespace syncer