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

ui/compositor/test/in_process_context_factory.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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 141 matching lines @@
   attribs.bind_generates_resource = false;
   scoped_refptr<InProcessContextProvider> context_provider =
       InProcessContextProvider::Create(
           attribs, shared_worker_context_provider_.get(),
           &gpu_memory_buffer_manager_, &image_factory_, compositor->widget(),
           "UICompositor");
 
   std::unique_ptr<cc::OutputSurface> display_output_surface;
   if (use_test_surface_) {
     bool flipped_output_surface = false;
-    display_output_surface = base::WrapUnique(new cc::PixelTestOutputSurface(
+    display_output_surface = base::MakeUnique<cc::PixelTestOutputSurface>(
         context_provider, shared_worker_context_provider_,
-        flipped_output_surface));
+        flipped_output_surface);
   } else {
-    display_output_surface = base::WrapUnique(new DirectOutputSurface(
-        context_provider, shared_worker_context_provider_));
+    display_output_surface = base::MakeUnique<DirectOutputSurface>(
+        context_provider, shared_worker_context_provider_);
   }
 
   if (surface_manager_) {
     std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source(
         new cc::DelayBasedBeginFrameSource(
             base::MakeUnique<cc::DelayBasedTimeSource>(
                 compositor->task_runner().get())));
     std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
         begin_frame_source.get(), compositor->task_runner().get(),
         display_output_surface->capabilities().max_frames_pending));
@@ skipping 93 matching lines @@
 
 void InProcessContextFactory::AddObserver(ContextFactoryObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void InProcessContextFactory::RemoveObserver(ContextFactoryObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 }  // namespace ui