| Index: extensions/browser/load_monitoring_extension_host_queue.h
|
| diff --git a/extensions/browser/load_monitoring_extension_host_queue.h b/extensions/browser/load_monitoring_extension_host_queue.h
|
| index 661e80fe6cacfedbbbf547910729f5876a1cdb43..64b9ee3a61826304e0423cbf46081ef82f817945 100644
|
| --- a/extensions/browser/load_monitoring_extension_host_queue.h
|
| +++ b/extensions/browser/load_monitoring_extension_host_queue.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/time/time.h"
|
| @@ -34,7 +34,7 @@ class LoadMonitoringExtensionHostQueue
|
| size_t, // max_awaiting_loading
|
| size_t // max_active_loading
|
| )>;
|
| - LoadMonitoringExtensionHostQueue(scoped_ptr<ExtensionHostQueue> delegate,
|
| + LoadMonitoringExtensionHostQueue(std::unique_ptr<ExtensionHostQueue> delegate,
|
| base::TimeDelta monitor_time,
|
| const FinishedCallback& finished_callback);
|
|
|
| @@ -43,7 +43,7 @@ class LoadMonitoringExtensionHostQueue
|
| // Monitoring will not start until the first Add()ed
|
| // DeferredStartRenderHost starts loading, or StartMonitoring() is called.
|
| explicit LoadMonitoringExtensionHostQueue(
|
| - scoped_ptr<ExtensionHostQueue> delegate);
|
| + std::unique_ptr<ExtensionHostQueue> delegate);
|
|
|
| ~LoadMonitoringExtensionHostQueue() override;
|
|
|
| @@ -79,7 +79,7 @@ class LoadMonitoringExtensionHostQueue
|
| void FinishMonitoring();
|
|
|
| // Delegate actually loading DeferredStartRenderHosts to another queue.
|
| - scoped_ptr<ExtensionHostQueue> delegate_;
|
| + std::unique_ptr<ExtensionHostQueue> delegate_;
|
|
|
| // The amount of time to monitor for. By default this is 1 minute, but it can
|
| // be overriden by tests.
|
|
|