Replace scoped_ptr with std::unique_ptr in //ui

ui/views/mus/platform_test_helper_mus.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/test/platform_test_helper.h"
-
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/background/tests/test_catalog_store.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "ui/aura/env.h"
 #include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/test/platform_test_helper.h"
 #include "ui/views/views_delegate.h"
 
 using mojo::shell::BackgroundShell;
 
 namespace views {
 namespace {
 
 const char kTestName[] = "mojo:test-app";
 
 class DefaultShellClient : public mojo::ShellClient {
  public:
   DefaultShellClient() {}
   ~DefaultShellClient() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
 };
 
-scoped_ptr<mojo::shell::TestCatalogStore> BuildTestCatalogStore() {
-  scoped_ptr<base::ListValue> apps(new base::ListValue);
+std::unique_ptr<mojo::shell::TestCatalogStore> BuildTestCatalogStore() {
+  std::unique_ptr<base::ListValue> apps(new base::ListValue);
   apps->Append(
       mojo::shell::BuildPermissiveSerializedAppInfo(kTestName, "test"));
-  return make_scoped_ptr(new mojo::shell::TestCatalogStore(std::move(apps)));
+  return base::WrapUnique(new mojo::shell::TestCatalogStore(std::move(apps)));
 }
 
 class PlatformTestHelperMus : public PlatformTestHelper {
  public:
   PlatformTestHelperMus() {
     background_shell_.reset(new BackgroundShell);
-    scoped_ptr<BackgroundShell::InitParams> init_params(
+    std::unique_ptr<BackgroundShell::InitParams> init_params(
         new BackgroundShell::InitParams);
     init_params->catalog_store = BuildTestCatalogStore();
     background_shell_->Init(std::move(init_params));
     shell_client_.reset(new DefaultShellClient);
     shell_connection_.reset(new mojo::ShellConnection(
         shell_client_.get(),
         background_shell_->CreateShellClientRequest(kTestName)));
 
     // TODO(rockot): Remove this RunLoop. http://crbug.com/594852.
     base::RunLoop wait_loop;
@@ skipping 29 matching lines @@
       internal::NativeWidgetDelegate* delegate) {
     ui::ContextFactory* factory = aura::Env::GetInstance()->context_factory();
     aura::Env::GetInstance()->set_context_factory(nullptr);
     NativeWidget* result =
         WindowManagerConnection::Get()->CreateNativeWidgetMus(
             props, init_params, delegate);
     aura::Env::GetInstance()->set_context_factory(factory);
     return result;
   }
 
-  scoped_ptr<BackgroundShell> background_shell_;
-  scoped_ptr<mojo::ShellConnection> shell_connection_;
-  scoped_ptr<DefaultShellClient> shell_client_;
+  std::unique_ptr<BackgroundShell> background_shell_;
+  std::unique_ptr<mojo::ShellConnection> shell_connection_;
+  std::unique_ptr<DefaultShellClient> shell_client_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
 };
 
 }  // namespace
 
 // static
-scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() {
-  return make_scoped_ptr(new PlatformTestHelperMus);
+std::unique_ptr<PlatformTestHelper> PlatformTestHelper::Create() {
+  return base::WrapUnique(new PlatformTestHelperMus);
 }
 
 }  // namespace views