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

Side by Side Diff: content/browser/shared_worker/shared_worker_service_impl_unittest.cc

Issue 283623002: Add support for passing an arbitrary parameter to an IPC message handler. The motivation is for Web… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 EXPECT_EQ(connector->temporary_remote_port_route_id(), msg->routing_id()); 350 EXPECT_EQ(connector->temporary_remote_port_route_id(), msg->routing_id());
351 } 351 }
352 352
353 void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host, 353 void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host,
354 int expected_msg_route_id, 354 int expected_msg_route_id,
355 int expected_sent_message_port_id, 355 int expected_sent_message_port_id,
356 int* routing_id) { 356 int* routing_id) {
357 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 357 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
358 EXPECT_EQ(WorkerMsg_Connect::ID, msg->type()); 358 EXPECT_EQ(WorkerMsg_Connect::ID, msg->type());
359 EXPECT_EQ(expected_msg_route_id, msg->routing_id()); 359 EXPECT_EQ(expected_msg_route_id, msg->routing_id());
360 int port_id; 360 WorkerMsg_Connect::Param params;
361 EXPECT_TRUE(WorkerMsg_Connect::Read(msg.get(), &port_id, routing_id)); 361 EXPECT_TRUE(WorkerMsg_Connect::Read(msg.get(), &params));
362 int port_id = params.a;
363 *routing_id = params.b;
362 EXPECT_EQ(expected_sent_message_port_id, port_id); 364 EXPECT_EQ(expected_sent_message_port_id, port_id);
363 } 365 }
364 366
365 void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host, 367 void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host,
366 int expected_msg_route_id, 368 int expected_msg_route_id,
367 std::string expected_data) { 369 std::string expected_data) {
368 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 370 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
369 EXPECT_EQ(MessagePortMsg_Message::ID, msg->type()); 371 EXPECT_EQ(MessagePortMsg_Message::ID, msg->type());
370 EXPECT_EQ(expected_msg_route_id, msg->routing_id()); 372 EXPECT_EQ(expected_msg_route_id, msg->routing_id());
371 base::string16 data; 373 MessagePortMsg_Message::Param params;
372 std::vector<int> sent_message_port_ids; 374 EXPECT_TRUE(MessagePortMsg_Message::Read(msg.get(), &params));
373 std::vector<int> new_routing_ids; 375 base::string16 data = params.a;
374 EXPECT_TRUE(MessagePortMsg_Message::Read(
375 msg.get(), &data, &sent_message_port_ids, &new_routing_ids));
376 EXPECT_EQ(base::ASCIIToUTF16(expected_data), data); 376 EXPECT_EQ(base::ASCIIToUTF16(expected_data), data);
377 } 377 }
378 378
379 void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host, 379 void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host,
380 MockSharedWorkerConnector* connector) { 380 MockSharedWorkerConnector* connector) {
381 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 381 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
382 EXPECT_EQ(ViewMsg_WorkerConnected::ID, msg->type()); 382 EXPECT_EQ(ViewMsg_WorkerConnected::ID, msg->type());
383 EXPECT_EQ(connector->route_id(), msg->routing_id()); 383 EXPECT_EQ(connector->route_id(), msg->routing_id());
384 } 384 }
385 385
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 kDocumentIDs[2], 898 kDocumentIDs[2],
899 kRenderFrameRouteIDs[2]); 899 kRenderFrameRouteIDs[2]);
900 EXPECT_NE(MSG_ROUTING_NONE, connector2->route_id()); 900 EXPECT_NE(MSG_ROUTING_NONE, connector2->route_id());
901 EXPECT_EQ(0U, renderer_host2->QueuedMessageCount()); 901 EXPECT_EQ(0U, renderer_host2->QueuedMessageCount());
902 RunAllPendingInMessageLoop(); 902 RunAllPendingInMessageLoop();
903 EXPECT_EQ(1U, renderer_host2->QueuedMessageCount()); 903 EXPECT_EQ(1U, renderer_host2->QueuedMessageCount());
904 CheckViewMsgWorkerCreated(renderer_host2.get(), connector2.get()); 904 CheckViewMsgWorkerCreated(renderer_host2.get(), connector2.get());
905 } 905 }
906 906
907 } // namespace content 907 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/shared_worker/shared_worker_host.cc ('k') | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698