Index: content/browser/shared_worker/shared_worker_service_impl.h |
diff --git a/content/browser/shared_worker/shared_worker_service_impl.h b/content/browser/shared_worker/shared_worker_service_impl.h |
index 4af3bbf2537a440199b5a1929019af9778ddcbcd..22073e8cebcf4d08bb847ce5545fc221491db248 100644 |
--- a/content/browser/shared_worker/shared_worker_service_impl.h |
+++ b/content/browser/shared_worker/shared_worker_service_impl.h |
@@ -5,12 +5,12 @@ |
#ifndef CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_SERVICE_IMPL_H_ |
#define CONTENT_BROWSER_SHARED_WORKER_SHARED_WORKER_SERVICE_IMPL_H_ |
+#include <memory> |
#include <set> |
#include "base/compiler_specific.h" |
#include "base/containers/scoped_ptr_hash_map.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/singleton.h" |
#include "base/observer_list.h" |
#include "content/public/browser/notification_observer.h" |
@@ -104,8 +104,10 @@ class CONTENT_EXPORT SharedWorkerServiceImpl |
// Pair of render_process_id and worker_route_id. |
typedef std::pair<int, int> ProcessRouteIdPair; |
typedef base::ScopedPtrHashMap<ProcessRouteIdPair, |
- scoped_ptr<SharedWorkerHost>> WorkerHostMap; |
- typedef base::ScopedPtrHashMap<int, scoped_ptr<SharedWorkerPendingInstance>> |
+ std::unique_ptr<SharedWorkerHost>> |
+ WorkerHostMap; |
+ typedef base::ScopedPtrHashMap<int, |
+ std::unique_ptr<SharedWorkerPendingInstance>> |
PendingInstanceMap; |
SharedWorkerServiceImpl(); |
@@ -118,7 +120,7 @@ class CONTENT_EXPORT SharedWorkerServiceImpl |
// RenderProcessReservedCallback() or RenderProcessReserveFailedCallback() |
// will be called on IO thread. |
void ReserveRenderProcessToCreateWorker( |
- scoped_ptr<SharedWorkerPendingInstance> pending_instance, |
+ std::unique_ptr<SharedWorkerPendingInstance> pending_instance, |
blink::WebWorkerCreationError* creation_error); |
// Called after the render process is reserved to create Shared Worker in it. |