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

ios/chrome/browser/google/google_url_tracker_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/google/google_url_tracker_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "components/google/core/browser/google_pref_names.h"
 #include "components/google/core/browser/google_url_tracker.h"
@@ skipping 29 matching lines @@
 std::unique_ptr<KeyedService> GoogleURLTrackerFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
 
   // Delete this now-unused pref.
   // At some point in the future, this code can be removed entirely.
   browser_state->GetOriginalChromeBrowserState()->GetPrefs()->ClearPref(
       prefs::kLastPromptedGoogleURL);
 
-  return base::WrapUnique(new GoogleURLTracker(
+  return base::MakeUnique<GoogleURLTracker>(
       base::WrapUnique(new GoogleURLTrackerClientImpl(browser_state)),
-      GoogleURLTracker::NORMAL_MODE));
+      GoogleURLTracker::NORMAL_MODE);
 }
 
 web::BrowserState* GoogleURLTrackerFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
   return GetBrowserStateRedirectedInIncognito(context);
 }
 
 bool GoogleURLTrackerFactory::ServiceIsCreatedWithBrowserState() const {
   return true;
 }
 
 bool GoogleURLTrackerFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 void GoogleURLTrackerFactory::RegisterBrowserStatePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   GoogleURLTracker::RegisterProfilePrefs(registry);
 }
 
 }  // namespace ios