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

services/shell/public/cpp/lib/service_context_ref.cc

 // Copyright 2016 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 "services/shell/public/cpp/service_context_ref.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_checker.h"
@@ skipping 31 matching lines @@
     DCHECK(thread_checker_.CalledOnValidThread());
 
     if (service_task_runner_->BelongsToCurrentThread() && factory_) {
       factory_->AddRef();
     } else {
       service_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&ServiceContextRefFactory::AddRef, factory_));
     }
 
-    return base::WrapUnique(
-        new ServiceContextRefImpl(factory_, service_task_runner_));
+    return base::MakeUnique<ServiceContextRefImpl>(factory_,
+                                                   service_task_runner_);
   }
 
   base::WeakPtr<ServiceContextRefFactory> factory_;
   scoped_refptr<base::SingleThreadTaskRunner> service_task_runner_;
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceContextRefImpl);
 };
 
 ServiceContextRefFactory::ServiceContextRefFactory(
     const base::Closure& quit_closure)
     : quit_closure_(quit_closure), weak_factory_(this) {
   DCHECK(!quit_closure_.is_null());
 }
 
 ServiceContextRefFactory::~ServiceContextRefFactory() {}
 
 std::unique_ptr<ServiceContextRef> ServiceContextRefFactory::CreateRef() {
   AddRef();
-  return base::WrapUnique(
-      new ServiceContextRefImpl(weak_factory_.GetWeakPtr(),
-                                 base::ThreadTaskRunnerHandle::Get()));
+  return base::MakeUnique<ServiceContextRefImpl>(
+      weak_factory_.GetWeakPtr(), base::ThreadTaskRunnerHandle::Get());
 }
 
 void ServiceContextRefFactory::AddRef() {
   ++ref_count_;
 }
 
 void ServiceContextRefFactory::Release() {
   if (!--ref_count_)
     quit_closure_.Run();
 }
 
 }  // namespace shell