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

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

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

Powered by Google App Engine
This is Rietveld 408576698