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

components/browser_sync/browser/profile_sync_components_factory_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/browser_sync/browser/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 276 matching lines @@
     const std::string& name,
     invalidation::InvalidationService* invalidator,
     const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
     const base::FilePath& sync_folder) {
   return new browser_sync::SyncBackendHostImpl(
       name, sync_client_, ui_thread_, invalidator, sync_prefs, sync_folder);
 }
 
 std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
 ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
-  return base::WrapUnique(
-      new browser_sync::LocalDeviceInfoProviderImpl(channel_, version_,
-                                                    is_tablet_));
+  return base::MakeUnique<browser_sync::LocalDeviceInfoProviderImpl>(
+      channel_, version_, is_tablet_);
 }
 
 class TokenServiceProvider
     : public OAuth2TokenServiceRequest::TokenServiceProvider {
  public:
   TokenServiceProvider(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       OAuth2TokenService* token_service);
 
   // OAuth2TokenServiceRequest::TokenServiceProvider implementation.
@@ skipping 87 matching lines @@
 #else
   const bool kExpectMobileBookmarksFolder = false;
 #endif
   BookmarkModelAssociator* model_associator = new BookmarkModelAssociator(
       bookmark_model, sync_service->GetSyncClient(), user_share, error_handler,
       kExpectMobileBookmarksFolder);
   BookmarkChangeProcessor* change_processor = new BookmarkChangeProcessor(
       sync_service->GetSyncClient(), model_associator, error_handler);
   return SyncComponents(model_associator, change_processor);
 }