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

Unified Diff: content/browser/media/session/media_session_controller_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, 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/browser/media/session/media_session_controller_unittest.cc
diff --git a/content/browser/media/session/media_session_controller_unittest.cc b/content/browser/media/session/media_session_controller_unittest.cc
index 1b04aac3cc9f32b7363049e8e41fdca416eca88b..a2fc8f5e3221b00a60602e9c55cb6aa309921d4a 100644
--- a/content/browser/media/session/media_session_controller_unittest.cc
+++ b/content/browser/media/session/media_session_controller_unittest.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/tuple.h"
+#include <tuple>
+
#include "content/browser/media/media_web_contents_observer.h"
#include "content/browser/media/session/media_session.h"
#include "content/browser/media/session/media_session_controller.h"
@@ -69,13 +70,13 @@ class MediaSessionControllerTest : public RenderViewHostImplTestHarness {
if (!msg)
return false;
- base::Tuple<int> result;
+ std::tuple<int> result;
if (!T::Read(msg, &result))
return false;
- EXPECT_EQ(id_.second, base::get<0>(result));
+ EXPECT_EQ(id_.second, std::get<0>(result));
test_sink().ClearMessages();
- return id_.second == base::get<0>(result);
+ return id_.second == std::get<0>(result);
}
template <typename T>
@@ -84,17 +85,17 @@ class MediaSessionControllerTest : public RenderViewHostImplTestHarness {
if (!msg)
return false;
- base::Tuple<int, double> result;
+ std::tuple<int, double> result;
if (!T::Read(msg, &result))
return false;
- EXPECT_EQ(id_.second, base::get<0>(result));
- if (id_.second != base::get<0>(result))
+ EXPECT_EQ(id_.second, std::get<0>(result));
+ if (id_.second != std::get<0>(result))
return false;
- EXPECT_EQ(expected_multiplier, base::get<1>(result));
+ EXPECT_EQ(expected_multiplier, std::get<1>(result));
test_sink().ClearMessages();
- return expected_multiplier == base::get<1>(result);
+ return expected_multiplier == std::get<1>(result);
}
WebContentsObserver::MediaPlayerId id_;

Powered by Google App Engine
This is Rietveld 408576698