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

ios/chrome/browser/search_engines/template_url_service_factory.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 "ios/chrome/browser/search_engines/template_url_service_factory.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
@@ skipping 24 matching lines @@
                     rlz_lib::SET_TO_GOOGLE);
 #else
   return base::Closure();
 #endif
 }
 
 std::unique_ptr<KeyedService> BuildTemplateURLService(
     web::BrowserState* context) {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
-  return base::WrapUnique(new TemplateURLService(
+  return base::MakeUnique<TemplateURLService>(
       browser_state->GetPrefs(),
       base::WrapUnique(new ios::UIThreadSearchTermsData(browser_state)),
       ios::WebDataServiceFactory::GetKeywordWebDataForBrowserState(
           browser_state, ServiceAccessType::EXPLICIT_ACCESS),
       base::WrapUnique(new ios::TemplateURLServiceClientImpl(
           ios::HistoryServiceFactory::GetForBrowserState(
               browser_state, ServiceAccessType::EXPLICIT_ACCESS))),
       ios::GoogleURLTrackerFactory::GetForBrowserState(browser_state),
       GetApplicationContext()->GetRapporService(),
-      GetDefaultSearchProviderChangedCallback()));
+      GetDefaultSearchProviderChangedCallback());
 }
 
 }  // namespace
 
 // static
 TemplateURLService* TemplateURLServiceFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state) {
   return static_cast<TemplateURLService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ skipping 35 matching lines @@
 web::BrowserState* TemplateURLServiceFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
   return GetBrowserStateRedirectedInIncognito(context);
 }
 
 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 }  // namespace ios