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

components/search_engines/search_engine_data_type_controller_unittest.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/search_engines/search_engine_data_type_controller.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 54 matching lines @@
  protected:
   void PreloadTemplateURLService() {
     template_url_service_->set_disable_load(false);
     template_url_service_->Load();
   }
 
   void SetStartExpectations() {
     search_engine_dtc_->SetGenericChangeProcessorFactoryForTest(
         base::WrapUnique<sync_driver::GenericChangeProcessorFactory>(
             new sync_driver::FakeGenericChangeProcessorFactory(
-                base::WrapUnique(new sync_driver::FakeGenericChangeProcessor(
-                    syncer::SEARCH_ENGINES, this)))));
+                base::MakeUnique<sync_driver::FakeGenericChangeProcessor>(
+                    syncer::SEARCH_ENGINES, this))));
     EXPECT_CALL(model_load_callback_, Run(_, _));
   }
 
   void Start() {
     search_engine_dtc_->LoadModels(
         base::Bind(&sync_driver::ModelLoadCallbackMock::Run,
                    base::Unretained(&model_load_callback_)));
     search_engine_dtc_->StartAssociating(
         base::Bind(&sync_driver::StartCallbackMock::Run,
                    base::Unretained(&start_callback_)));
@@ skipping 95 matching lines @@
   EXPECT_FALSE(syncable_service_.syncing());
   search_engine_dtc_->Stop();
   EXPECT_EQ(NULL, search_engine_dtc_->GetSubscriptionForTesting());
   EXPECT_EQ(sync_driver::DataTypeController::NOT_RUNNING,
             search_engine_dtc_->state());
   EXPECT_FALSE(syncable_service_.syncing());
 }
 
 }  // namespace
 }  // namespace browser_sync