| Index: mojo/shell/static_application_loader.cc
|
| diff --git a/mojo/shell/static_application_loader.cc b/mojo/shell/static_application_loader.cc
|
| index 482021dfead006ecfb545df405f125287ec74e4e..023d31233a1779b2ea7049de84758031e84e513b 100644
|
| --- a/mojo/shell/static_application_loader.cc
|
| +++ b/mojo/shell/static_application_loader.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "mojo/shell/static_application_loader.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -28,7 +30,7 @@ class RunnerThread : public base::SimpleThread {
|
| const base::Closure& exit_callback,
|
| const StaticApplicationLoader::ApplicationFactory& factory)
|
| : base::SimpleThread("Mojo Application: " + url.spec()),
|
| - request_(request.Pass()),
|
| + request_(std::move(request)),
|
| exit_task_runner_(exit_task_runner),
|
| exit_callback_(exit_callback),
|
| factory_(factory) {}
|
| @@ -78,9 +80,9 @@ void StaticApplicationLoader::Load(const GURL& url,
|
| // with a new app instance.
|
| auto exit_callback = base::Bind(&StaticApplicationLoader::StopAppThread,
|
| weak_factory_.GetWeakPtr());
|
| - thread_.reset(
|
| - new RunnerThread(url, request.Pass(), base::ThreadTaskRunnerHandle::Get(),
|
| - exit_callback, factory_));
|
| + thread_.reset(new RunnerThread(url, std::move(request),
|
| + base::ThreadTaskRunnerHandle::Get(),
|
| + exit_callback, factory_));
|
| thread_->Start();
|
| }
|
|
|
|
|