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

android_webview/browser/test/rendering_test.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 "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 45 matching lines @@
   DCHECK(!browser_view_renderer_.get());
   DCHECK(!functor_.get());
   browser_view_renderer_.reset(
       new TestBrowserViewRenderer(this, base::ThreadTaskRunnerHandle::Get()));
   browser_view_renderer_->SetActiveCompositorID(CompositorID(0, 0));
   InitializeCompositor();
   std::unique_ptr<FakeWindow> window(
       new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
   functor_.reset(new FakeFunctor);
   functor_->Init(window.get(),
-                 base::WrapUnique(new RenderThreadManager(
-                     functor_.get(), base::ThreadTaskRunnerHandle::Get())));
+                 base::MakeUnique<RenderThreadManager>(
+                     functor_.get(), base::ThreadTaskRunnerHandle::Get()));
   browser_view_renderer_->SetCurrentCompositorFrameConsumer(
       functor_->GetCompositorFrameConsumer());
   window_ = std::move(window);
 }
 
 CompositorFrameConsumer* RenderingTest::GetCompositorFrameConsumer() {
   return functor_->GetCompositorFrameConsumer();
 }
 
 CompositorFrameProducer* RenderingTest::GetCompositorFrameProducer() {
@@ skipping 79 matching lines @@
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview