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

services/ui/ws/frame_generator_unittest.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/ui/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/test/test_message_loop.h"
 #include "cc/quads/render_pass.h"
@@ skipping 53 matching lines @@
 
 void FrameGeneratorTest::DrawWindowTree(cc::RenderPass* pass) {
   frame_generator_->DrawWindowTree(pass,
                                    frame_generator_delegate_->GetRootWindow(),
                                    gfx::Vector2d(), 1.0f, nullptr);
 }
 
 void FrameGeneratorTest::SetUp() {
   testing::Test::SetUp();
   frame_generator_delegate_.reset(new TestFrameGeneratorDelegate(
-      base::WrapUnique(new ServerWindow(&window_delegate_, WindowId()))));
+      base::MakeUnique<ServerWindow>(&window_delegate_, WindowId())));
   PlatformDisplayInitParams init_params;
   frame_generator_.reset(new FrameGenerator(frame_generator_delegate_.get(),
                                             init_params.surfaces_state));
   InitWindow(root_window());
 }
 
 void FrameGeneratorTest::TearDown() {
   frame_generator_.reset();
   frame_generator_delegate_.reset();
 }
@@ skipping 36 matching lines @@
   EXPECT_EQ(3u, quad_state_list->size());
   auto it = quad_state_list->begin();
   EXPECT_EQ(child_opacity * root_opacity, (*it)->opacity);
   EXPECT_EQ(child_opacity * root_opacity, (*++it)->opacity);
   EXPECT_EQ(root_opacity, (*++it)->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui