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

components/proximity_auth/unlock_manager.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 "components/proximity_auth/unlock_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 303 matching lines @@
     } else {
       PA_LOG(INFO) << "[Unlock] Protocol v3.1 not supported, skipping "
                    << "request_unlock.";
       GetMessenger()->DispatchUnlockEvent();
     }
   }
 }
 
 std::unique_ptr<ProximityMonitor> UnlockManager::CreateProximityMonitor(
     const RemoteDevice& remote_device) {
-  return base::WrapUnique(new ProximityMonitorImpl(
-      remote_device, base::WrapUnique(new base::DefaultTickClock())));
+  return base::MakeUnique<ProximityMonitorImpl>(
+      remote_device, base::WrapUnique(new base::DefaultTickClock()));
 }
 
 void UnlockManager::SendSignInChallenge() {
   if (!life_cycle_ || !GetMessenger() || !GetMessenger()->GetSecureContext()) {
     PA_LOG(ERROR) << "Not ready to send sign-in challenge";
     return;
   }
 
   RemoteDevice remote_device = life_cycle_->GetRemoteDevice();
   proximity_auth_client_->GetChallengeForUserAndDevice(
@@ skipping 158 matching lines @@
 
 Messenger* UnlockManager::GetMessenger() {
   // TODO(tengs): We should use a weak pointer to hold the Messenger instance
   // instead.
   if (!life_cycle_)
     return nullptr;
   return life_cycle_->GetMessenger();
 }
 
 }  // namespace proximity_auth