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

Unified Diff: content/browser/renderer_host/render_widget_host_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/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 8753f01db830fc1160cb22983bfe2d3f4667b6e7..9412a2851e4243aec6d0c5173eb10720ba482762 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
#include <memory>
+#include <tuple>
#include "base/bind.h"
#include "base/command_line.h"
@@ -67,7 +68,7 @@ std::string GetInputMessageTypes(MockRenderProcessHost* process) {
EXPECT_EQ(InputMsg_HandleInputEvent::ID, message->type());
InputMsg_HandleInputEvent::Param params;
EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, &params));
- const WebInputEvent* event = base::get<0>(params);
+ const WebInputEvent* event = std::get<0>(params);
if (i != 0)
result += " ";
result += WebInputEventTraits::GetName(event->type);
@@ -858,9 +859,9 @@ TEST_F(RenderWidgetHostTest, Background) {
process_->sink().GetUniqueMessageMatching(
ViewMsg_SetBackgroundOpaque::ID);
ASSERT_TRUE(set_background);
- base::Tuple<bool> sent_background;
+ std::tuple<bool> sent_background;
ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background);
- EXPECT_FALSE(base::get<0>(sent_background));
+ EXPECT_FALSE(std::get<0>(sent_background));
#if defined(USE_AURA)
// See the comment above |InitAsChild(NULL)|.
@@ -895,9 +896,9 @@ TEST_F(RenderWidgetHostTest, HiddenPaint) {
const IPC::Message* restored = process_->sink().GetUniqueMessageMatching(
ViewMsg_WasShown::ID);
ASSERT_TRUE(restored);
- base::Tuple<bool, ui::LatencyInfo> needs_repaint;
+ std::tuple<bool, ui::LatencyInfo> needs_repaint;
ViewMsg_WasShown::Read(restored, &needs_repaint);
- EXPECT_TRUE(base::get<0>(needs_repaint));
+ EXPECT_TRUE(std::get<0>(needs_repaint));
}
TEST_F(RenderWidgetHostTest, IgnoreKeyEventsHandledByRenderer) {
@@ -1532,8 +1533,8 @@ void CheckLatencyInfoComponentInMessage(RenderWidgetHostProcess* process,
InputMsg_HandleInputEvent::Param params;
EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, &params));
- const WebInputEvent* event = base::get<0>(params);
- ui::LatencyInfo latency_info = base::get<1>(params);
+ const WebInputEvent* event = std::get<0>(params);
+ ui::LatencyInfo latency_info = std::get<1>(params);
EXPECT_TRUE(event->type == expected_type);
EXPECT_TRUE(latency_info.FindLatency(

Powered by Google App Engine
This is Rietveld 408576698