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 8e1dd80104d964c12374e501f99c1fad520ac5b0..bdcc3ebc5be6419229ec78fdbab258136ca995bf 100644 |
--- a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc |
+++ b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc |
@@ -326,12 +326,12 @@ void CheckWorkerProcessMsgCreateWorker( |
int* route_id) { |
scoped_ptr<IPC::Message> msg(renderer_host->PopMessage()); |
EXPECT_EQ(WorkerProcessMsg_CreateWorker::ID, msg->type()); |
- Tuple1<WorkerProcessMsg_CreateWorker_Params> param; |
+ Tuple<WorkerProcessMsg_CreateWorker_Params> param; |
EXPECT_TRUE(WorkerProcessMsg_CreateWorker::Read(msg.get(), ¶m)); |
- EXPECT_EQ(GURL(expected_url), param.a.url); |
- EXPECT_EQ(base::ASCIIToUTF16(expected_name), param.a.name); |
- EXPECT_EQ(expected_security_policy_type, param.a.security_policy_type); |
- *route_id = param.a.route_id; |
+ EXPECT_EQ(GURL(expected_url), get<0>(param).url); |
+ EXPECT_EQ(base::ASCIIToUTF16(expected_name), get<0>(param).name); |
+ EXPECT_EQ(expected_security_policy_type, get<0>(param).security_policy_type); |
+ *route_id = get<0>(param).route_id; |
} |
void CheckViewMsgWorkerCreated(MockRendererProcessHost* renderer_host, |
@@ -357,8 +357,8 @@ void CheckWorkerMsgConnect(MockRendererProcessHost* renderer_host, |
EXPECT_EQ(expected_msg_route_id, msg->routing_id()); |
WorkerMsg_Connect::Param params; |
EXPECT_TRUE(WorkerMsg_Connect::Read(msg.get(), ¶ms)); |
- int port_id = params.a; |
- *routing_id = params.b; |
+ int port_id = get<0>(params); |
+ *routing_id = get<1>(params); |
EXPECT_EQ(expected_sent_message_port_id, port_id); |
} |
@@ -370,7 +370,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(), ¶ms)); |
- base::string16 data = params.a; |
+ base::string16 data = get<0>(params); |
EXPECT_EQ(base::ASCIIToUTF16(expected_data), data); |
} |