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

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

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 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 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 1bc7946ce571e077e6b227c7a3b81c7772722886..57cca3d7296b5273ff5d24e1a670f0874a92c836 100644
--- a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc
@@ -9,6 +9,7 @@
#include <map>
#include <memory>
#include <set>
+#include <tuple>
#include <vector>
#include "base/atomic_sequence_num.h"
@@ -332,13 +333,13 @@ void CheckWorkerProcessMsgCreateWorker(
int* route_id) {
std::unique_ptr<IPC::Message> msg(renderer_host->PopMessage());
EXPECT_EQ(WorkerProcessMsg_CreateWorker::ID, msg->type());
- base::Tuple<WorkerProcessMsg_CreateWorker_Params> param;
+ std::tuple<WorkerProcessMsg_CreateWorker_Params> param;
EXPECT_TRUE(WorkerProcessMsg_CreateWorker::Read(msg.get(), &param));
- EXPECT_EQ(GURL(expected_url), base::get<0>(param).url);
- EXPECT_EQ(base::ASCIIToUTF16(expected_name), base::get<0>(param).name);
+ EXPECT_EQ(GURL(expected_url), std::get<0>(param).url);
+ EXPECT_EQ(base::ASCIIToUTF16(expected_name), std::get<0>(param).name);
EXPECT_EQ(expected_security_policy_type,
- base::get<0>(param).security_policy_type);
- *route_id = base::get<0>(param).route_id;
+ std::get<0>(param).security_policy_type);
+ *route_id = std::get<0>(param).route_id;
}
void CheckViewMsgWorkerCreated(MockRendererProcessHost* renderer_host,
@@ -364,8 +365,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(), &params));
- int port_id = base::get<0>(params);
- *routing_id = base::get<1>(params);
+ int port_id = std::get<0>(params);
+ *routing_id = std::get<1>(params);
EXPECT_EQ(expected_sent_message_port_id, port_id);
}
@@ -377,7 +378,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);
+ base::string16 data = std::get<0>(params);
EXPECT_EQ(base::ASCIIToUTF16(expected_data), data);
}

Powered by Google App Engine
This is Rietveld 408576698