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

chromecast/media/cdm/cast_cdm_proxy.cc

 // Copyright 2014 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 "chromecast/media/cdm/cast_cdm_proxy.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 51 matching lines @@
 void CdmPromiseInternal<T...>::resolve(const T&... result) {
   MarkPromiseSettled();
   task_runner_->PostTask(
       FROM_HERE, base::Bind(&::media::CdmPromiseTemplate<T...>::resolve,
                             base::Owned(promise_.release()), result...));
 }
 
 template <typename... T>
 std::unique_ptr<CdmPromiseInternal<T...>> BindPromiseToCurrentLoop(
     std::unique_ptr<::media::CdmPromiseTemplate<T...>> promise) {
-  return base::WrapUnique(new CdmPromiseInternal<T...>(std::move(promise)));
+  return base::MakeUnique<CdmPromiseInternal<T...>>(std::move(promise));
 }
 
 }  // namespace
 
 // A macro runs current member function on |task_runner_| thread.
 #define FORWARD_ON_CDM_THREAD(param_fn, ...)    \
   task_runner_->PostTask(                       \
       FROM_HERE, base::Bind(&CastCdm::param_fn, \
                             base::Unretained(cast_cdm_.get()), ##__VA_ARGS__))
 
@@ skipping 75 matching lines @@
 
 ::media::CdmContext* CastCdmProxy::GetCdmContext() {
   // This will be recast as a CastCdmService pointer before being passed to the
   // media pipeline. The returned object should only be called on the CMA
   // renderer thread.
   return cast_cdm_->GetCdmContext();
 }
 
 }  // namespace media
 }  // namespace chromecast