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

android_webview/browser/browser_view_renderer_unittest.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 <map>
 #include <queue>
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 429 matching lines @@
       int frame_number) override {
     switch (frame_number) {
       case 0: {
         // Draw a frame with initial RTM.
         break;
       }
       case 1: {
         // Switch to new RTM.
         std::unique_ptr<FakeFunctor> functor(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());
         saved_functor_ = std::move(functor_);
         functor_ = std::move(functor);
         break;
       }
       case 2: {
         // Draw a frame with the new RTM, but also redraw the initial RTM.
         window_->RequestDrawGL(saved_functor_.get());
         break;
@@ skipping 30 matching lines @@
   }
 
  private:
   std::unique_ptr<FakeFunctor> saved_functor_;
   OutputSurfaceResourceCountMap expected_return_count_;
 };
 
 RENDERING_TEST_F(RenderThreadManagerSwitchTest);
 
 }  // namespace android_webview