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

Unified Diff: content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
index 4a9c5d2db38f85a0cb2a30f75fc7fbe290544745..c420942016967c746d629b8dc0d71132b8e3efe9 100644
--- a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
+++ b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
@@ -116,10 +116,10 @@ class WebRTCIdentityServiceHostTest : public ::testing::Test {
IPC::Message ipc = host_->GetLastMessage();
EXPECT_EQ(ipc.type(), WebRTCIdentityHostMsg_RequestFailed::ID);
- Tuple2<int, int> error_in_message;
+ Tuple<int, int> error_in_message;
WebRTCIdentityHostMsg_RequestFailed::Read(&ipc, &error_in_message);
- EXPECT_EQ(FAKE_SEQUENCE_NUMBER, error_in_message.a);
- EXPECT_EQ(error, error_in_message.b);
+ EXPECT_EQ(FAKE_SEQUENCE_NUMBER, get<0>(error_in_message));
+ EXPECT_EQ(error, get<1>(error_in_message));
}
void VerifyIdentityReadyMessage(const std::string& cert,
@@ -128,11 +128,11 @@ class WebRTCIdentityServiceHostTest : public ::testing::Test {
IPC::Message ipc = host_->GetLastMessage();
EXPECT_EQ(ipc.type(), WebRTCIdentityHostMsg_IdentityReady::ID);
- Tuple3<int, std::string, std::string> identity_in_message;
+ Tuple<int, std::string, std::string> identity_in_message;
WebRTCIdentityHostMsg_IdentityReady::Read(&ipc, &identity_in_message);
- EXPECT_EQ(FAKE_SEQUENCE_NUMBER, identity_in_message.a);
- EXPECT_EQ(cert, identity_in_message.b);
- EXPECT_EQ(key, identity_in_message.c);
+ EXPECT_EQ(FAKE_SEQUENCE_NUMBER, get<0>(identity_in_message));
+ EXPECT_EQ(cert, get<1>(identity_in_message));
+ EXPECT_EQ(key, get<2>(identity_in_message));
}
protected:

Powered by Google App Engine
This is Rietveld 408576698