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

services/ui/public/cpp/tests/window_server_shelltest_base.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/public/cpp/tests/window_server_shelltest_base.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 38 matching lines @@
 WindowServerServiceTestBase::WindowServerServiceTestBase()
     : ServiceTest(kTestAppName) {
   EnsureCommandLineSwitch(switches::kUseTestConfig);
   EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests);
 }
 
 WindowServerServiceTestBase::~WindowServerServiceTestBase() {}
 
 std::unique_ptr<shell::Service>
 WindowServerServiceTestBase::CreateService() {
-  return base::WrapUnique(new WindowServerServiceTestClient(this));
+  return base::MakeUnique<WindowServerServiceTestClient>(this);
 }
 
 }  // namespace ui