Convert //chrome from scoped_ptr to std::unique_ptr

chrome/app/mash/mash_runner.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 "chrome/app/mash/mash_runner.h"
 
 #include "ash/mus/sysui_application.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 65 matching lines @@
       shell_connection_.reset(
           new shell::ShellConnection(shell_client_.get(), std::move(request)));
       return;
     }
     LOG(ERROR) << "unknown name " << mojo_name;
     NOTREACHED();
   }
 
  private:
   // TODO(sky): move this into mash.
-  scoped_ptr<shell::ShellClient> CreateShellClient(const std::string& name) {
+  std::unique_ptr<shell::ShellClient> CreateShellClient(
+      const std::string& name) {
     if (name == "mojo:ash_sysui")
       return base::WrapUnique(new ash::sysui::SysUIApplication);
     if (name == "mojo:desktop_wm")
       return base::WrapUnique(new mash::wm::WindowManagerApplication);
     if (name == "mojo:mash_session")
       return base::WrapUnique(new mash::session::Session);
     if (name == "mojo:mus")
       return base::WrapUnique(new mus::MandolineUIServicesApp);
     if (name == "mojo:quick_launch")
       return base::WrapUnique(new mash::quick_launch::QuickLaunchApplication);
     if (name == "mojo:resource_provider") {
       return base::WrapUnique(
           new resource_provider::ResourceProviderApp("mojo:resource_provider"));
     }
     if (name == "mojo:task_viewer")
       return base::WrapUnique(new mash::task_viewer::TaskViewer);
 #if defined(OS_LINUX)
     if (name == "mojo:font_service")
       return base::WrapUnique(new font_service::FontServiceApp);
 #endif
     if (name == "mojo:browser_driver") {
       return base::WrapUnique(
           new mash::browser_driver::BrowserDriverApplicationDelegate());
     }
     return nullptr;
   }
 
   mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_;
-  scoped_ptr<shell::ShellClient> shell_client_;
-  scoped_ptr<shell::ShellConnection> shell_connection_;
+  std::unique_ptr<shell::ShellClient> shell_client_;
+  std::unique_ptr<shell::ShellConnection> shell_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
 };
 
 bool IsChild() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kProcessType) &&
          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
              switches::kProcessType) == kMashChild;
 }
@@ skipping 54 matching lines @@
   else
     RunMain();
 }
 
 void MashRunner::RunMain() {
   // TODO(sky): refactor backgroundshell so can supply own context, we
   // shouldn't we using context as it has a lot of stuff we don't really want
   // in chrome.
   NativeRunnerDelegateImpl native_runner_delegate;
   shell::BackgroundShell background_shell;
-  scoped_ptr<shell::BackgroundShell::InitParams> init_params(
+  std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
       new shell::BackgroundShell::InitParams);
   init_params->native_runner_delegate = &native_runner_delegate;
   background_shell.Init(std::move(init_params));
   shell_client_.reset(new DefaultShellClient);
   shell_connection_.reset(new shell::ShellConnection(
       shell_client_.get(),
       background_shell.CreateShellClientRequest("exe:chrome_mash")));
   shell_connection_->connector()->Connect("mojo:mash_session");
   base::MessageLoop::current()->Run();
 }
@@ skipping 22 matching lines @@
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(true,   // Process ID
                        true,   // Thread ID
                        true,   // Timestamp
                        true);  // Tick count
 
   // TODO(sky): use MessagePumpMojo.
-  scoped_ptr<base::MessageLoop> message_loop;
+  std::unique_ptr<base::MessageLoop> message_loop;
 #if defined(OS_LINUX)
   base::AtExitManager exit_manager;
 #endif
   if (!IsChild())
     message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }