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

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

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: media Created 6 years 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
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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 }; 319 };
320 320
321 void CheckWorkerProcessMsgCreateWorker( 321 void CheckWorkerProcessMsgCreateWorker(
322 MockRendererProcessHost* renderer_host, 322 MockRendererProcessHost* renderer_host,
323 const std::string& expected_url, 323 const std::string& expected_url,
324 const std::string& expected_name, 324 const std::string& expected_name,
325 blink::WebContentSecurityPolicyType expected_security_policy_type, 325 blink::WebContentSecurityPolicyType expected_security_policy_type,
326 int* route_id) { 326 int* route_id) {
327 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 327 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
328 EXPECT_EQ(WorkerProcessMsg_CreateWorker::ID, msg->type()); 328 EXPECT_EQ(WorkerProcessMsg_CreateWorker::ID, msg->type());
329 Tuple1<WorkerProcessMsg_CreateWorker_Params> param; 329 Tuple<WorkerProcessMsg_CreateWorker_Params> param;
330 EXPECT_TRUE(WorkerProcessMsg_CreateWorker::Read(msg.get(), &param)); 330 EXPECT_TRUE(WorkerProcessMsg_CreateWorker::Read(msg.get(), &param));
331 EXPECT_EQ(GURL(expected_url), param.a.url); 331 EXPECT_EQ(GURL(expected_url), get<0>(param).url);
332 EXPECT_EQ(base::ASCIIToUTF16(expected_name), param.a.name); 332 EXPECT_EQ(base::ASCIIToUTF16(expected_name), get<0>(param).name);
333 EXPECT_EQ(expected_security_policy_type, param.a.security_policy_type); 333 EXPECT_EQ(expected_security_policy_type, get<0>(param).security_policy_type);
334 *route_id = param.a.route_id; 334 *route_id = get<0>(param).route_id;
335 } 335 }
336 336
337 void CheckViewMsgWorkerCreated(MockRendererProcessHost* renderer_host, 337 void CheckViewMsgWorkerCreated(MockRendererProcessHost* renderer_host,
338 MockSharedWorkerConnector* connector) { 338 MockSharedWorkerConnector* connector) {
339 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 339 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
340 EXPECT_EQ(ViewMsg_WorkerCreated::ID, msg->type()); 340 EXPECT_EQ(ViewMsg_WorkerCreated::ID, msg->type());
341 EXPECT_EQ(connector->route_id(), msg->routing_id()); 341 EXPECT_EQ(connector->route_id(), msg->routing_id());
342 } 342 }
343 343
344 void CheckMessagePortMsgMessagesQueued(MockRendererProcessHost* renderer_host, 344 void CheckMessagePortMsgMessagesQueued(MockRendererProcessHost* renderer_host,
345 MockSharedWorkerConnector* connector) { 345 MockSharedWorkerConnector* connector) {
346 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 346 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
347 EXPECT_EQ(MessagePortMsg_MessagesQueued::ID, msg->type()); 347 EXPECT_EQ(MessagePortMsg_MessagesQueued::ID, msg->type());
348 EXPECT_EQ(connector->temporary_remote_port_route_id(), msg->routing_id()); 348 EXPECT_EQ(connector->temporary_remote_port_route_id(), msg->routing_id());
349 } 349 }
350 350
351 void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host, 351 void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host,
352 int expected_msg_route_id, 352 int expected_msg_route_id,
353 int expected_sent_message_port_id, 353 int expected_sent_message_port_id,
354 int* routing_id) { 354 int* routing_id) {
355 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 355 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
356 EXPECT_EQ(WorkerMsg_Connect::ID, msg->type()); 356 EXPECT_EQ(WorkerMsg_Connect::ID, msg->type());
357 EXPECT_EQ(expected_msg_route_id, msg->routing_id()); 357 EXPECT_EQ(expected_msg_route_id, msg->routing_id());
358 WorkerMsg_Connect::Param params; 358 WorkerMsg_Connect::Param params;
359 EXPECT_TRUE(WorkerMsg_Connect::Read(msg.get(), &params)); 359 EXPECT_TRUE(WorkerMsg_Connect::Read(msg.get(), &params));
360 int port_id = params.a; 360 int port_id = get<0>(params);
361 *routing_id = params.b; 361 *routing_id = get<1>(params);
362 EXPECT_EQ(expected_sent_message_port_id, port_id); 362 EXPECT_EQ(expected_sent_message_port_id, port_id);
363 } 363 }
364 364
365 void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host, 365 void CheckMessagePortMsgMessage(MockRendererProcessHost* renderer_host,
366 int expected_msg_route_id, 366 int expected_msg_route_id,
367 std::string expected_data) { 367 std::string expected_data) {
368 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 368 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
369 EXPECT_EQ(MessagePortMsg_Message::ID, msg->type()); 369 EXPECT_EQ(MessagePortMsg_Message::ID, msg->type());
370 EXPECT_EQ(expected_msg_route_id, msg->routing_id()); 370 EXPECT_EQ(expected_msg_route_id, msg->routing_id());
371 MessagePortMsg_Message::Param params; 371 MessagePortMsg_Message::Param params;
372 EXPECT_TRUE(MessagePortMsg_Message::Read(msg.get(), &params)); 372 EXPECT_TRUE(MessagePortMsg_Message::Read(msg.get(), &params));
373 base::string16 data = params.a; 373 base::string16 data = get<0>(params);
374 EXPECT_EQ(base::ASCIIToUTF16(expected_data), data); 374 EXPECT_EQ(base::ASCIIToUTF16(expected_data), data);
375 } 375 }
376 376
377 void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host, 377 void CheckViewMsgWorkerConnected(MockRendererProcessHost* renderer_host,
378 MockSharedWorkerConnector* connector) { 378 MockSharedWorkerConnector* connector) {
379 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); 379 scoped_ptr<IPC::Message> msg(renderer_host->PopMessage());
380 EXPECT_EQ(ViewMsg_WorkerConnected::ID, msg->type()); 380 EXPECT_EQ(ViewMsg_WorkerConnected::ID, msg->type());
381 EXPECT_EQ(connector->route_id(), msg->routing_id()); 381 EXPECT_EQ(connector->route_id(), msg->routing_id());
382 } 382 }
383 383
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 kDocumentIDs[2], 908 kDocumentIDs[2],
909 kRenderFrameRouteIDs[2]); 909 kRenderFrameRouteIDs[2]);
910 EXPECT_NE(MSG_ROUTING_NONE, connector2->route_id()); 910 EXPECT_NE(MSG_ROUTING_NONE, connector2->route_id());
911 EXPECT_EQ(0U, renderer_host2->QueuedMessageCount()); 911 EXPECT_EQ(0U, renderer_host2->QueuedMessageCount());
912 RunAllPendingInMessageLoop(); 912 RunAllPendingInMessageLoop();
913 EXPECT_EQ(1U, renderer_host2->QueuedMessageCount()); 913 EXPECT_EQ(1U, renderer_host2->QueuedMessageCount());
914 CheckViewMsgWorkerCreated(renderer_host2.get(), connector2.get()); 914 CheckViewMsgWorkerCreated(renderer_host2.get(), connector2.get());
915 } 915 }
916 916
917 } // namespace content 917 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698