Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: content/browser/devtools/shared_worker_devtools_manager_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/shared_worker_devtools_manager_unittest.cc
diff --git a/content/browser/devtools/shared_worker_devtools_manager_unittest.cc b/content/browser/devtools/shared_worker_devtools_manager_unittest.cc
index c6f86d5fc230865cd2c2ff308bf03ec666d2ce31..9ea0926858cc5c7e933cad8ed66dbfac332c6669 100644
--- a/content/browser/devtools/shared_worker_devtools_manager_unittest.cc
+++ b/content/browser/devtools/shared_worker_devtools_manager_unittest.cc
@@ -6,8 +6,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "content/browser/browser_thread_impl.h"
@@ -91,8 +92,8 @@ class SharedWorkerDevToolsManagerTest : public testing::Test {
base::MessageLoopForIO message_loop_;
BrowserThreadImpl ui_thread_;
- scoped_ptr<TestBrowserContext> browser_context_;
- scoped_ptr<WorkerStoragePartition> partition_;
+ std::unique_ptr<TestBrowserContext> browser_context_;
+ std::unique_ptr<WorkerStoragePartition> partition_;
const WorkerStoragePartitionId partition_id_;
SharedWorkerDevToolsManager* manager_;
};
@@ -194,7 +195,8 @@ TEST_F(SharedWorkerDevToolsManagerTest, AttachTest) {
blink::WebSharedWorkerCreationContextTypeNonsecure);
// Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed
- scoped_ptr<TestDevToolsClientHost> client_host1(new TestDevToolsClientHost());
+ std::unique_ptr<TestDevToolsClientHost> client_host1(
+ new TestDevToolsClientHost());
CheckWorkerNotExist(2, 1);
manager_->WorkerCreated(2, 1, instance1);
CheckWorkerState(2, 1, WorkerState::WORKER_UNINSPECTED);
@@ -211,7 +213,8 @@ TEST_F(SharedWorkerDevToolsManagerTest, AttachTest) {
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
// Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed
- scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost());
+ std::unique_ptr<TestDevToolsClientHost> client_host2(
+ new TestDevToolsClientHost());
manager_->WorkerCreated(2, 2, instance2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(2, 2);
@@ -270,7 +273,8 @@ TEST_F(SharedWorkerDevToolsManagerTest, ReattachTest) {
blink::WebContentSecurityPolicyTypeReport, blink::WebAddressSpacePublic,
browser_context_->GetResourceContext(), partition_id_,
blink::WebSharedWorkerCreationContextTypeNonsecure);
- scoped_ptr<TestDevToolsClientHost> client_host(new TestDevToolsClientHost());
+ std::unique_ptr<TestDevToolsClientHost> client_host(
+ new TestDevToolsClientHost());
// Created -> GetDevToolsAgentHost -> Register -> Destroyed
manager_->WorkerCreated(3, 1, instance);
CheckWorkerState(3, 1, WorkerState::WORKER_UNINSPECTED);
« no previous file with comments | « content/browser/devtools/shared_worker_devtools_agent_host.h ('k') | content/browser/devtools/worker_devtools_agent_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698