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

Unified Diff: content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 years, 7 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/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
index 4872ec891cd5abb3ac4bf743645378a65300a2a5..64a306bac9bfc34d8a0f92733d1ec6acffe0455f 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <tuple>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/run_loop.h"
#include "base/test/simple_test_tick_clock.h"
-#include "base/tuple.h"
#include "content/common/media/media_player_delegate_messages.h"
#include "content/public/renderer/render_view.h"
#include "content/public/test/render_view_test.h"
@@ -78,13 +79,13 @@ TEST_F(RendererWebMediaPlayerDelegateTest, SendsMessagesCorrectly) {
MediaPlayerDelegateHostMsg_OnMediaPlaying::ID);
ASSERT_TRUE(msg);
- base::Tuple<int, bool, bool, bool, base::TimeDelta> result;
+ std::tuple<int, bool, bool, bool, base::TimeDelta> result;
ASSERT_TRUE(MediaPlayerDelegateHostMsg_OnMediaPlaying::Read(msg, &result));
- EXPECT_EQ(delegate_id, base::get<0>(result));
- EXPECT_EQ(kHasVideo, base::get<1>(result));
- EXPECT_EQ(kHasAudio, base::get<2>(result));
- EXPECT_EQ(kIsRemote, base::get<3>(result));
- EXPECT_EQ(kDuration, base::get<4>(result));
+ EXPECT_EQ(delegate_id, std::get<0>(result));
+ EXPECT_EQ(kHasVideo, std::get<1>(result));
+ EXPECT_EQ(kHasAudio, std::get<2>(result));
+ EXPECT_EQ(kIsRemote, std::get<3>(result));
+ EXPECT_EQ(kDuration, std::get<4>(result));
}
// Verify the paused message.
@@ -97,10 +98,10 @@ TEST_F(RendererWebMediaPlayerDelegateTest, SendsMessagesCorrectly) {
MediaPlayerDelegateHostMsg_OnMediaPaused::ID);
ASSERT_TRUE(msg);
- base::Tuple<int, bool> result;
+ std::tuple<int, bool> result;
ASSERT_TRUE(MediaPlayerDelegateHostMsg_OnMediaPaused::Read(msg, &result));
- EXPECT_EQ(delegate_id, base::get<0>(result));
- EXPECT_EQ(kReachedEndOfStream, base::get<1>(result));
+ EXPECT_EQ(delegate_id, std::get<0>(result));
+ EXPECT_EQ(kReachedEndOfStream, std::get<1>(result));
}
// Verify the destruction message.
@@ -111,10 +112,10 @@ TEST_F(RendererWebMediaPlayerDelegateTest, SendsMessagesCorrectly) {
MediaPlayerDelegateHostMsg_OnMediaDestroyed::ID);
ASSERT_TRUE(msg);
- base::Tuple<int> result;
+ std::tuple<int> result;
ASSERT_TRUE(
MediaPlayerDelegateHostMsg_OnMediaDestroyed::Read(msg, &result));
- EXPECT_EQ(delegate_id, base::get<0>(result));
+ EXPECT_EQ(delegate_id, std::get<0>(result));
}
delegate_manager_->RemoveObserver(delegate_id);
« no previous file with comments | « content/renderer/media/render_media_log_unittest.cc ('k') | content/renderer/pepper/pepper_file_chooser_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698