| Index: extensions/browser/load_monitoring_extension_host_queue_unittest.cc
|
| diff --git a/extensions/browser/load_monitoring_extension_host_queue_unittest.cc b/extensions/browser/load_monitoring_extension_host_queue_unittest.cc
|
| index b5ba446869694d88014fcfdc721fe025d63d0a22..a36bdfa5ef1174d91d38d117cec4e971b3914073 100644
|
| --- a/extensions/browser/load_monitoring_extension_host_queue_unittest.cc
|
| +++ b/extensions/browser/load_monitoring_extension_host_queue_unittest.cc
|
| @@ -2,17 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "extensions/browser/load_monitoring_extension_host_queue.h"
|
| +
|
| #include <stddef.h>
|
|
|
| #include <limits>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/run_loop.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "extensions/browser/deferred_start_render_host.h"
|
| #include "extensions/browser/extensions_test.h"
|
| -#include "extensions/browser/load_monitoring_extension_host_queue.h"
|
| #include "extensions/browser/serial_extension_host_queue.h"
|
|
|
| namespace extensions {
|
| @@ -58,7 +60,7 @@ class LoadMonitoringExtensionHostQueueTest : public ExtensionsTest {
|
| void SetUp() override {
|
| queue_.reset(new LoadMonitoringExtensionHostQueue(
|
| // Use a SerialExtensionHostQueue because it's simple.
|
| - scoped_ptr<ExtensionHostQueue>(new SerialExtensionHostQueue()),
|
| + std::unique_ptr<ExtensionHostQueue>(new SerialExtensionHostQueue()),
|
| base::TimeDelta(), // no delay, easier to test
|
| base::Bind(&LoadMonitoringExtensionHostQueueTest::Finished,
|
| base::Unretained(this))));
|
| @@ -68,7 +70,7 @@ class LoadMonitoringExtensionHostQueueTest : public ExtensionsTest {
|
| // Creates a new DeferredStartRenderHost. Ownership is held by this class,
|
| // not passed to caller.
|
| StubDeferredStartRenderHost* CreateHost() {
|
| - stubs_.push_back(make_scoped_ptr(new StubDeferredStartRenderHost()));
|
| + stubs_.push_back(base::WrapUnique(new StubDeferredStartRenderHost()));
|
| return stubs_.back().get();
|
| }
|
|
|
| @@ -100,8 +102,8 @@ class LoadMonitoringExtensionHostQueueTest : public ExtensionsTest {
|
| }
|
|
|
| content::TestBrowserThreadBundle thread_bundle_;
|
| - scoped_ptr<LoadMonitoringExtensionHostQueue> queue_;
|
| - std::vector<scoped_ptr<StubDeferredStartRenderHost>> stubs_;
|
| + std::unique_ptr<LoadMonitoringExtensionHostQueue> queue_;
|
| + std::vector<std::unique_ptr<StubDeferredStartRenderHost>> stubs_;
|
|
|
| // Set after the queue has finished monitoring.
|
| bool finished_;
|
|
|