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

ui/views/mus/views_mus_test_suite.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 "ui/views/mus/views_mus_test_suite.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 41 matching lines @@
 
  private:
   std::unique_ptr<WindowManagerConnection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
 };
 
 std::unique_ptr<PlatformTestHelper> CreatePlatformTestHelper(
     const shell::Identity& identity,
     const base::Callback<shell::Connector*(void)>& callback) {
-  return base::WrapUnique(new PlatformTestHelperMus(callback.Run(), identity));
+  return base::MakeUnique<PlatformTestHelperMus>(callback.Run(), identity);
 }
 
 }  // namespace
 
 class ShellConnection {
  public:
   ShellConnection() : thread_("Persistent shell connections") {
     base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
     base::Thread::Options options;
@@ skipping 95 matching lines @@
   ViewsTestSuite::Initialize();
   shell_connections_.reset(new ShellConnection);
 }
 
 void ViewsMusTestSuite::Shutdown() {
   shell_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views