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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/shared_worker/shared_worker_service_impl_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
« no previous file with comments | « content/browser/shared_worker/shared_worker_service_impl.cc ('k') | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/shared_worker/shared_worker_service_impl_unittest.cc
diff --git a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
index 1c7d40905d149c64a4c3916eea6bac7cb30f2098..990f14aa070c629524f6b900be1291051c61a186 100644
--- a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
@@ -2,22 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/browser/shared_worker/shared_worker_service_impl.h"
+
#include <stddef.h>
#include <map>
+#include <memory>
#include <set>
#include <vector>
#include "base/atomic_sequence_num.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "content/browser/message_port_message_filter.h"
#include "content/browser/shared_worker/shared_worker_message_filter.h"
-#include "content/browser/shared_worker/shared_worker_service_impl.h"
#include "content/browser/shared_worker/worker_storage_partition.h"
#include "content/common/message_port_messages.h"
#include "content/common/view_messages.h"
@@ -83,8 +84,8 @@ class SharedWorkerServiceImplTest : public testing::Test {
}
TestBrowserThreadBundle browser_thread_bundle_;
- scoped_ptr<TestBrowserContext> browser_context_;
- scoped_ptr<WorkerStoragePartition> partition_;
+ std::unique_ptr<TestBrowserContext> browser_context_;
+ std::unique_ptr<WorkerStoragePartition> partition_;
static int s_update_worker_dependency_call_count_;
static std::vector<int> s_worker_dependency_added_ids_;
static std::vector<int> s_worker_dependency_removed_ids_;
@@ -188,14 +189,14 @@ class MockRendererProcessHost {
}
bool OnMessageReceived(IPC::Message* message) {
- scoped_ptr<IPC::Message> msg(message);
+ std::unique_ptr<IPC::Message> msg(message);
const bool ret = message_filter_->OnMessageReceived(*message) ||
worker_filter_->OnMessageReceived(*message);
if (message->is_sync()) {
CHECK(!queued_messages_.empty());
const IPC::Message* response_msg = queued_messages_.back();
IPC::SyncMessage* sync_msg = static_cast<IPC::SyncMessage*>(message);
- scoped_ptr<IPC::MessageReplyDeserializer> reply_serializer(
+ std::unique_ptr<IPC::MessageReplyDeserializer> reply_serializer(
sync_msg->GetReplyDeserializer());
bool result = reply_serializer->SerializeOutputParameters(*response_msg);
CHECK(result);
@@ -206,9 +207,9 @@ class MockRendererProcessHost {
size_t QueuedMessageCount() const { return queued_messages_.size(); }
- scoped_ptr<IPC::Message> PopMessage() {
+ std::unique_ptr<IPC::Message> PopMessage() {
CHECK(queued_messages_.size());
- scoped_ptr<IPC::Message> msg(*queued_messages_.begin());
+ std::unique_ptr<IPC::Message> msg(*queued_messages_.begin());
queued_messages_.weak_erase(queued_messages_.begin());
return msg;
}
@@ -328,7 +329,7 @@ void CheckWorkerProcessMsgCreateWorker(
const std::string& expected_name,
blink::WebContentSecurityPolicyType expected_security_policy_type,
int* route_id) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(WorkerProcessMsg_CreateWorker::ID, msg->type());
base::Tuple<WorkerProcessMsg_CreateWorker_Params> param;
EXPECT_TRUE(WorkerProcessMsg_CreateWorker::Read(msg.get(), &param));
@@ -341,14 +342,14 @@ void CheckWorkerProcessMsgCreateWorker(
void CheckViewMsgWorkerCreated(MockRendererProcessHost* renderer_host,
MockSharedWorkerConnector* connector) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(ViewMsg_WorkerCreated::ID, msg->type());
EXPECT_EQ(connector->route_id(), msg->routing_id());
}
void CheckMessagePortMsgMessagesQueued(MockRendererProcessHost* renderer_host,
MockSharedWorkerConnector* connector) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(MessagePortMsg_MessagesQueued::ID, msg->type());
EXPECT_EQ(connector->temporary_remote_port_route_id(), msg->routing_id());
}
@@ -357,7 +358,7 @@ void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host,
int expected_msg_route_id,
int expected_sent_message_port_id,
int* routing_id) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(WorkerMsg_Connect::ID, msg->type());
EXPECT_EQ(expected_msg_route_id, msg->routing_id());
WorkerMsg_Connect::Param params;
@@ -370,7 +371,7 @@ void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host,
void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host,
int expected_msg_route_id,
std::string expected_data) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(MessagePortMsg_Message::ID, msg->type());
EXPECT_EQ(expected_msg_route_id, msg->routing_id());
MessagePortMsg_Message::Param params;
@@ -381,7 +382,7 @@ void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host,
void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host,
MockSharedWorkerConnector* connector) {
- scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
+ std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(ViewMsg_WorkerConnected::ID, msg->type());
EXPECT_EQ(connector->route_id(), msg->routing_id());
}
@@ -389,11 +390,11 @@ void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host,
} // namespace
TEST_F(SharedWorkerServiceImplTest, BasicTest) {
- scoped_ptr<MockRendererProcessHost> renderer_host(
+ std::unique_ptr<MockRendererProcessHost> renderer_host(
new MockRendererProcessHost(kProcessIDs[0],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockSharedWorkerConnector> connector(
+ std::unique_ptr<MockSharedWorkerConnector> connector(
new MockSharedWorkerConnector(renderer_host.get()));
int worker_route_id;
int worker_msg_port_route_id;
@@ -486,11 +487,11 @@ TEST_F(SharedWorkerServiceImplTest, BasicTest) {
TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {
// The first renderer host.
- scoped_ptr<MockRendererProcessHost> renderer_host0(
+ std::unique_ptr<MockRendererProcessHost> renderer_host0(
new MockRendererProcessHost(kProcessIDs[0],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
int worker_route_id;
int worker_msg_port_route_id1;
@@ -578,11 +579,11 @@ TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {
renderer_host0.get(), connector0->local_port_route_id(), "test2");
// The second renderer host.
- scoped_ptr<MockRendererProcessHost> renderer_host1(
+ std::unique_ptr<MockRendererProcessHost> renderer_host1(
new MockRendererProcessHost(kProcessIDs[1],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
int worker_msg_port_route_id2;
@@ -667,12 +668,12 @@ TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {
TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
// The first renderer host.
- scoped_ptr<MockRendererProcessHost> renderer_host0(
+ std::unique_ptr<MockRendererProcessHost> renderer_host0(
new MockRendererProcessHost(kProcessIDs[0],
browser_context_->GetResourceContext(),
*partition_.get()));
// The second renderer host.
- scoped_ptr<MockRendererProcessHost> renderer_host1(
+ std::unique_ptr<MockRendererProcessHost> renderer_host1(
new MockRendererProcessHost(kProcessIDs[1],
browser_context_->GetResourceContext(),
*partition_.get()));
@@ -680,9 +681,9 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
// Normal case.
{
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
connector0->Create("http://example.com/w1.js",
"name1",
@@ -711,9 +712,9 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
// Normal case (URL mismatch).
{
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
connector0->Create("http://example.com/w2.js",
"name2",
@@ -743,9 +744,9 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
// Pending case.
{
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
connector0->Create("http://example.com/w3.js",
"name3",
@@ -773,9 +774,9 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
// Pending case (URL mismatch).
{
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
connector0->Create("http://example.com/w4.js",
"name4",
@@ -803,25 +804,25 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerTest) {
TEST_F(SharedWorkerServiceImplTest, CreateWorkerRaceTest) {
// Create three renderer hosts.
- scoped_ptr<MockRendererProcessHost> renderer_host0(
+ std::unique_ptr<MockRendererProcessHost> renderer_host0(
new MockRendererProcessHost(kProcessIDs[0],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockRendererProcessHost> renderer_host1(
+ std::unique_ptr<MockRendererProcessHost> renderer_host1(
new MockRendererProcessHost(kProcessIDs[1],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockRendererProcessHost> renderer_host2(
+ std::unique_ptr<MockRendererProcessHost> renderer_host2(
new MockRendererProcessHost(kProcessIDs[2],
browser_context_->GetResourceContext(),
*partition_.get()));
int worker_route_id;
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
- scoped_ptr<MockSharedWorkerConnector> connector2(
+ std::unique_ptr<MockSharedWorkerConnector> connector2(
new MockSharedWorkerConnector(renderer_host2.get()));
connector0->Create("http://example.com/w1.js",
"name1",
@@ -867,25 +868,25 @@ TEST_F(SharedWorkerServiceImplTest, CreateWorkerRaceTest) {
TEST_F(SharedWorkerServiceImplTest, CreateWorkerRaceTest2) {
// Create three renderer hosts.
- scoped_ptr<MockRendererProcessHost> renderer_host0(
+ std::unique_ptr<MockRendererProcessHost> renderer_host0(
new MockRendererProcessHost(kProcessIDs[0],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockRendererProcessHost> renderer_host1(
+ std::unique_ptr<MockRendererProcessHost> renderer_host1(
new MockRendererProcessHost(kProcessIDs[1],
browser_context_->GetResourceContext(),
*partition_.get()));
- scoped_ptr<MockRendererProcessHost> renderer_host2(
+ std::unique_ptr<MockRendererProcessHost> renderer_host2(
new MockRendererProcessHost(kProcessIDs[2],
browser_context_->GetResourceContext(),
*partition_.get()));
int worker_route_id;
- scoped_ptr<MockSharedWorkerConnector> connector0(
+ std::unique_ptr<MockSharedWorkerConnector> connector0(
new MockSharedWorkerConnector(renderer_host0.get()));
- scoped_ptr<MockSharedWorkerConnector> connector1(
+ std::unique_ptr<MockSharedWorkerConnector> connector1(
new MockSharedWorkerConnector(renderer_host1.get()));
- scoped_ptr<MockSharedWorkerConnector> connector2(
+ std::unique_ptr<MockSharedWorkerConnector> connector2(
new MockSharedWorkerConnector(renderer_host2.get()));
connector0->Create("http://example.com/w1.js",
"name1",
« no previous file with comments | « content/browser/shared_worker/shared_worker_service_impl.cc ('k') | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698