| Index: content/browser/shared_worker/shared_worker_service_impl.cc
|
| diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc
|
| index 400541a1d6c2c0ff3556b70b16015ed104798060..46d15bc6e615db0837195e9ba00c0be764719ef1 100644
|
| --- a/content/browser/shared_worker/shared_worker_service_impl.cc
|
| +++ b/content/browser/shared_worker/shared_worker_service_impl.cc
|
| @@ -5,10 +5,10 @@
|
| #include "content/browser/shared_worker/shared_worker_service_impl.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <algorithm>
|
| #include <iterator>
|
| #include <set>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| @@ -130,7 +130,7 @@ class SharedWorkerServiceImpl::SharedWorkerPendingInstance {
|
|
|
| explicit SharedWorkerPendingInstance(
|
| scoped_ptr<SharedWorkerInstance> instance)
|
| - : instance_(instance.Pass()) {}
|
| + : instance_(std::move(instance)) {}
|
| ~SharedWorkerPendingInstance() {}
|
| SharedWorkerInstance* instance() { return instance_.get(); }
|
| SharedWorkerInstance* release_instance() { return instance_.release(); }
|
| @@ -311,13 +311,14 @@ void SharedWorkerServiceImpl::CreateWorker(
|
| *creation_error = blink::WebWorkerCreationErrorSecureContextMismatch;
|
| return;
|
| }
|
| - pending->AddRequest(request.Pass());
|
| + pending->AddRequest(std::move(request));
|
| return;
|
| }
|
| scoped_ptr<SharedWorkerPendingInstance> pending_instance(
|
| - new SharedWorkerPendingInstance(instance.Pass()));
|
| - pending_instance->AddRequest(request.Pass());
|
| - ReserveRenderProcessToCreateWorker(pending_instance.Pass(), creation_error);
|
| + new SharedWorkerPendingInstance(std::move(instance)));
|
| + pending_instance->AddRequest(std::move(request));
|
| + ReserveRenderProcessToCreateWorker(std::move(pending_instance),
|
| + creation_error);
|
| }
|
|
|
| void SharedWorkerServiceImpl::ForwardToWorker(
|
| @@ -530,7 +531,7 @@ void SharedWorkerServiceImpl::ReserveRenderProcessToCreateWorker(
|
| worker_route_id,
|
| is_new_worker),
|
| s_try_increment_worker_ref_count_));
|
| - pending_instances_.set(pending_instance_id, pending_instance.Pass());
|
| + pending_instances_.set(pending_instance_id, std::move(pending_instance));
|
| }
|
|
|
| void SharedWorkerServiceImpl::RenderProcessReservedCallback(
|
| @@ -556,7 +557,7 @@ void SharedWorkerServiceImpl::RenderProcessReservedCallback(
|
| // Retry reserving a renderer process if the existed Shared Worker was
|
| // destroyed on IO thread while reserving the renderer process on UI
|
| // thread.
|
| - ReserveRenderProcessToCreateWorker(pending_instance.Pass(), NULL);
|
| + ReserveRenderProcessToCreateWorker(std::move(pending_instance), NULL);
|
| return;
|
| }
|
| pending_instance->RegisterToSharedWorkerHost(existing_host);
|
| @@ -569,7 +570,7 @@ void SharedWorkerServiceImpl::RenderProcessReservedCallback(
|
| pending_instance->RemoveRequest(worker_process_id);
|
| // Retry reserving a renderer process if the requested renderer process was
|
| // destroyed on IO thread while reserving the renderer process on UI thread.
|
| - ReserveRenderProcessToCreateWorker(pending_instance.Pass(), NULL);
|
| + ReserveRenderProcessToCreateWorker(std::move(pending_instance), NULL);
|
| return;
|
| }
|
| scoped_ptr<SharedWorkerHost> host(new SharedWorkerHost(
|
| @@ -579,7 +580,7 @@ void SharedWorkerServiceImpl::RenderProcessReservedCallback(
|
| const base::string16 name = host->instance()->name();
|
| host->Start(pause_on_start);
|
| worker_hosts_.set(std::make_pair(worker_process_id, worker_route_id),
|
| - host.Pass());
|
| + std::move(host));
|
| FOR_EACH_OBSERVER(
|
| WorkerServiceObserver,
|
| observers_,
|
| @@ -599,7 +600,7 @@ void SharedWorkerServiceImpl::RenderProcessReserveFailedCallback(
|
| return;
|
| pending_instance->RemoveRequest(worker_process_id);
|
| // Retry reserving a renderer process.
|
| - ReserveRenderProcessToCreateWorker(pending_instance.Pass(), NULL);
|
| + ReserveRenderProcessToCreateWorker(std::move(pending_instance), NULL);
|
| }
|
|
|
| SharedWorkerHost* SharedWorkerServiceImpl::FindSharedWorkerHost(
|
|
|