views/mus: Change 'reset(new' to base::MakeUnqiue.

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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_context.h"
 #include "services/ui/common/switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 namespace {
 
 void EnsureCommandLineSwitch(const std::string& name) {
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 class DefaultService : public shell::Service {
  public:
-   DefaultService() {}
+  DefaultService() {}
   ~DefaultService() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultService);
 };
 
 class PlatformTestHelperMus : public PlatformTestHelper {
  public:
   PlatformTestHelperMus(shell::Connector* connector,
                         const shell::Identity& identity) {
@@ skipping 60 matching lines @@
     DCHECK(shell_connector_);
     return shell_connector_.get();
   }
 
   void CloneConnector(base::WaitableEvent* wait) {
     shell_connector_ = shell_connection_->connector()->Clone();
     wait->Signal();
   }
 
   void SetUpConnections(base::WaitableEvent* wait) {
-    background_shell_.reset(new shell::BackgroundShell);
+    background_shell_ = base::MakeUnique<shell::BackgroundShell>();
     background_shell_->Init(nullptr);
-    service_.reset(new DefaultService);
-    shell_connection_.reset(new shell::ServiceContext(
-        service_.get(),
-        background_shell_->CreateServiceRequest(GetTestName())));
+    service_ = base::MakeUnique<DefaultService>();
+    shell_connection_ = base::MakeUnique<shell::ServiceContext>(
+        service_.get(), background_shell_->CreateServiceRequest(GetTestName()));
 
     // ui/views/mus requires a WindowManager running, so launch test_wm.
     shell::Connector* connector = shell_connection_->connector();
     connector->Connect("mojo:test_wm");
     shell_connector_ = connector->Clone();
     shell_identity_ = shell_connection_->identity();
     wait->Signal();
   }
 
   void TearDownConnections(base::WaitableEvent* wait) {
@@ skipping 26 matching lines @@
 ViewsMusTestSuite::~ViewsMusTestSuite() {}
 
 void ViewsMusTestSuite::Initialize() {
   PlatformTestHelper::SetIsMus();
   // Let other mojo apps know that we're running in tests. Do this with a
   // command line flag to avoid making blocking calls to other processes for
   // setup for tests (e.g. to unlock the screen in the window manager).
   EnsureCommandLineSwitch(ui::switches::kUseTestConfig);
 
   ViewsTestSuite::Initialize();
-  shell_connections_.reset(new ShellConnection);
+  shell_connections_ = base::MakeUnique<ShellConnection>();
 }
 
 void ViewsMusTestSuite::Shutdown() {
   shell_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views