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

Unified Diff: content/browser/shared_worker/shared_worker_service_impl_unittest.cc

Issue 1974613002: Remove code that was only used by navigator.connect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comment Created 4 years, 7 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/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 8fcfa4e37060fc9d510cf1a6bbf7044dd2eecb6a..1bc7946ce571e077e6b227c7a3b81c7772722886 100644
--- a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
@@ -287,11 +287,10 @@ class MockSharedWorkerConnector {
new MessagePortHostMsg_QueueMessages(remote_port_id_)));
}
void SendPostMessage(const std::string& data) {
- const std::vector<TransferredMessagePort> empty_ports;
+ const std::vector<int> empty_ports;
EXPECT_TRUE(
renderer_host_->OnMessageReceived(new MessagePortHostMsg_PostMessage(
- local_port_id_,
- MessagePortMessage(base::ASCIIToUTF16(data)), empty_ports)));
+ local_port_id_, base::ASCIIToUTF16(data), empty_ports)));
}
void SendConnect() {
EXPECT_TRUE(
@@ -378,7 +377,7 @@ void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host,
EXPECT_EQ(expected_msg_route_id, msg->routing_id());
MessagePortMsg_Message::Param params;
EXPECT_TRUE(MessagePortMsg_Message::Read(msg.get(), &params));
- base::string16 data = base::get<0>(params).message_as_string;
+ base::string16 data = base::get<0>(params);
EXPECT_EQ(base::ASCIIToUTF16(expected_data), data);
}
@@ -474,11 +473,11 @@ TEST_F(SharedWorkerServiceImplTest, BasicTest) {
// When SharedWorker side sends MessagePortHostMsg_PostMessage,
// SharedWorkerConnector side shuold receive MessagePortMsg_Message.
- const std::vector<TransferredMessagePort> empty_ports;
+ const std::vector<int> empty_ports;
EXPECT_TRUE(
renderer_host->OnMessageReceived(new MessagePortHostMsg_PostMessage(
connector->remote_port_id(),
- MessagePortMessage(base::ASCIIToUTF16("test2")), empty_ports)));
+ base::ASCIIToUTF16("test2"), empty_ports)));
EXPECT_EQ(1U, renderer_host->QueuedMessageCount());
CheckMessagePortMsgMessage(
renderer_host.get(), connector->local_port_route_id(), "test2");
@@ -571,11 +570,11 @@ TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {
// When SharedWorker side sends MessagePortHostMsg_PostMessage,
// SharedWorkerConnector side shuold receive MessagePortMsg_Message.
- const std::vector<TransferredMessagePort> empty_ports;
+ const std::vector<int> empty_ports;
EXPECT_TRUE(
renderer_host0->OnMessageReceived(new MessagePortHostMsg_PostMessage(
connector0->remote_port_id(),
- MessagePortMessage(base::ASCIIToUTF16("test2")), empty_ports)));
+ base::ASCIIToUTF16("test2"), empty_ports)));
EXPECT_EQ(1U, renderer_host0->QueuedMessageCount());
CheckMessagePortMsgMessage(
renderer_host0.get(), connector0->local_port_route_id(), "test2");
@@ -654,7 +653,7 @@ TEST_F(SharedWorkerServiceImplTest, TwoRendererTest) {
EXPECT_TRUE(
renderer_host0->OnMessageReceived(new MessagePortHostMsg_PostMessage(
connector1->remote_port_id(),
- MessagePortMessage(base::ASCIIToUTF16("test4")), empty_ports)));
+ base::ASCIIToUTF16("test4"), empty_ports)));
EXPECT_EQ(1U, renderer_host1->QueuedMessageCount());
CheckMessagePortMsgMessage(
renderer_host1.get(), connector1->local_port_route_id(), "test4");
« no previous file with comments | « content/browser/service_worker/service_worker_version.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698