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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 80b3135f2fb48755fe97e23dea31f257867af9f4..4a466688df1a7a071df82610c10659fc972d5a86 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <tuple>
#include <utility>
#include "base/command_line.h"
@@ -529,11 +530,11 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
return;
}
- InputEventDispatchType dispatch_type = base::get<2>(params);
+ InputEventDispatchType dispatch_type = std::get<2>(params);
if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING)
return;
- const blink::WebInputEvent* event = base::get<0>(params);
+ const blink::WebInputEvent* event = std::get<0>(params);
SendTouchEventACK(event->type, ack_result,
WebInputEventTraits::GetUniqueTouchEventId(*event));
}
@@ -923,8 +924,8 @@ TEST_F(RenderWidgetHostViewAuraTest, ParentMovementUpdatesScreenRect) {
ASSERT_EQ(ViewMsg_UpdateScreenRects::ID, msg->type());
ViewMsg_UpdateScreenRects::Param params;
ViewMsg_UpdateScreenRects::Read(msg, &params);
- EXPECT_EQ(gfx::Rect(24, 24, 100, 100), base::get<0>(params));
- EXPECT_EQ(gfx::Rect(1, 1, 300, 300), base::get<1>(params));
+ EXPECT_EQ(gfx::Rect(24, 24, 100, 100), std::get<0>(params));
+ EXPECT_EQ(gfx::Rect(1, 1, 300, 300), std::get<1>(params));
sink_->ClearMessages();
widget_host_->OnMessageReceived(
ViewHostMsg_UpdateScreenRects_ACK(widget_host_->GetRoutingID()));
@@ -936,8 +937,8 @@ TEST_F(RenderWidgetHostViewAuraTest, ParentMovementUpdatesScreenRect) {
msg = sink_->GetMessageAt(0);
ASSERT_EQ(ViewMsg_UpdateScreenRects::ID, msg->type());
ViewMsg_UpdateScreenRects::Read(msg, &params);
- EXPECT_EQ(gfx::Rect(33, 33, 100, 100), base::get<0>(params));
- EXPECT_EQ(gfx::Rect(10, 10, 300, 300), base::get<1>(params));
+ EXPECT_EQ(gfx::Rect(33, 33, 100, 100), std::get<0>(params));
+ EXPECT_EQ(gfx::Rect(10, 10, 300, 300), std::get<1>(params));
sink_->ClearMessages();
widget_host_->OnMessageReceived(
ViewHostMsg_UpdateScreenRects_ACK(widget_host_->GetRoutingID()));
@@ -1108,22 +1109,21 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCompositionText) {
InputMsg_ImeSetComposition::Param params;
InputMsg_ImeSetComposition::Read(msg, &params);
// composition text
- EXPECT_EQ(composition_text.text, base::get<0>(params));
+ EXPECT_EQ(composition_text.text, std::get<0>(params));
// underlines
- ASSERT_EQ(underlines.size(), base::get<1>(params).size());
+ ASSERT_EQ(underlines.size(), std::get<1>(params).size());
for (size_t i = 0; i < underlines.size(); ++i) {
- EXPECT_EQ(underlines[i].start_offset,
- base::get<1>(params)[i].startOffset);
- EXPECT_EQ(underlines[i].end_offset, base::get<1>(params)[i].endOffset);
- EXPECT_EQ(underlines[i].color, base::get<1>(params)[i].color);
- EXPECT_EQ(underlines[i].thick, base::get<1>(params)[i].thick);
+ EXPECT_EQ(underlines[i].start_offset, std::get<1>(params)[i].startOffset);
+ EXPECT_EQ(underlines[i].end_offset, std::get<1>(params)[i].endOffset);
+ EXPECT_EQ(underlines[i].color, std::get<1>(params)[i].color);
+ EXPECT_EQ(underlines[i].thick, std::get<1>(params)[i].thick);
EXPECT_EQ(underlines[i].background_color,
- base::get<1>(params)[i].backgroundColor);
+ std::get<1>(params)[i].backgroundColor);
}
- EXPECT_EQ(gfx::Range::InvalidRange(), base::get<2>(params));
+ EXPECT_EQ(gfx::Range::InvalidRange(), std::get<2>(params));
// highlighted range
- EXPECT_EQ(4, base::get<3>(params)) << "Should be the same to the caret pos";
- EXPECT_EQ(4, base::get<4>(params)) << "Should be the same to the caret pos";
+ EXPECT_EQ(4, std::get<3>(params)) << "Should be the same to the caret pos";
+ EXPECT_EQ(4, std::get<4>(params)) << "Should be the same to the caret pos";
}
view_->ImeCancelComposition();
@@ -1395,9 +1395,10 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ("100x100", base::get<0>(params).new_size.ToString()); // dip size
- EXPECT_EQ("100x100",
- base::get<0>(params).physical_backing_size.ToString()); // backing size
+ EXPECT_EQ("100x100", std::get<0>(params).new_size.ToString()); // dip size
+ EXPECT_EQ(
+ "100x100",
+ std::get<0>(params).physical_backing_size.ToString()); // backing size
}
widget_host_->ResetSizeAndRepaintPendingFlags();
@@ -1412,10 +1413,11 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(2.0f, base::get<0>(params).screen_info.deviceScaleFactor);
- EXPECT_EQ("100x100", base::get<0>(params).new_size.ToString()); // dip size
- EXPECT_EQ("200x200",
- base::get<0>(params).physical_backing_size.ToString()); // backing size
+ EXPECT_EQ(2.0f, std::get<0>(params).screen_info.deviceScaleFactor);
+ EXPECT_EQ("100x100", std::get<0>(params).new_size.ToString()); // dip size
+ EXPECT_EQ(
+ "200x200",
+ std::get<0>(params).physical_backing_size.ToString()); // backing size
}
widget_host_->ResetSizeAndRepaintPendingFlags();
@@ -1430,10 +1432,11 @@ TEST_F(RenderWidgetHostViewAuraTest, PhysicalBackingSizeWithScale) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(1.0f, base::get<0>(params).screen_info.deviceScaleFactor);
- EXPECT_EQ("100x100", base::get<0>(params).new_size.ToString()); // dip size
- EXPECT_EQ("100x100",
- base::get<0>(params).physical_backing_size.ToString()); // backing size
+ EXPECT_EQ(1.0f, std::get<0>(params).screen_info.deviceScaleFactor);
+ EXPECT_EQ("100x100", std::get<0>(params).new_size.ToString()); // dip size
+ EXPECT_EQ(
+ "100x100",
+ std::get<0>(params).physical_backing_size.ToString()); // backing size
}
}
@@ -1597,17 +1600,15 @@ TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ("0,0 800x600",
- gfx::Rect(
- base::get<0>(params).screen_info.availableRect).ToString());
- EXPECT_EQ("800x600", base::get<0>(params).new_size.ToString());
+ EXPECT_EQ(
+ "0,0 800x600",
+ gfx::Rect(std::get<0>(params).screen_info.availableRect).ToString());
+ EXPECT_EQ("800x600", std::get<0>(params).new_size.ToString());
// Resizes are blocked until we swapped a frame of the correct size, and
// we've committed it.
view_->OnSwapCompositorFrame(
- 0,
- MakeDelegatedFrame(
- 1.f, base::get<0>(params).new_size,
- gfx::Rect(base::get<0>(params).new_size)));
+ 0, MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
+ gfx::Rect(std::get<0>(params).new_size)));
ui::DrawWaiterForTest::WaitForCommit(
root_window->GetHost()->compositor());
}
@@ -1624,15 +1625,13 @@ TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ("0,0 1600x1200",
- gfx::Rect(
- base::get<0>(params).screen_info.availableRect).ToString());
- EXPECT_EQ("1600x1200", base::get<0>(params).new_size.ToString());
+ EXPECT_EQ(
+ "0,0 1600x1200",
+ gfx::Rect(std::get<0>(params).screen_info.availableRect).ToString());
+ EXPECT_EQ("1600x1200", std::get<0>(params).new_size.ToString());
view_->OnSwapCompositorFrame(
- 0,
- MakeDelegatedFrame(
- 1.f, base::get<0>(params).new_size,
- gfx::Rect(base::get<0>(params).new_size)));
+ 0, MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
+ gfx::Rect(std::get<0>(params).new_size)));
ui::DrawWaiterForTest::WaitForCommit(
root_window->GetHost()->compositor());
}
@@ -1783,7 +1782,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(size2.ToString(), base::get<0>(params).new_size.ToString());
+ EXPECT_EQ(size2.ToString(), std::get<0>(params).new_size.ToString());
}
// Send resize ack to observe new Resize messages.
update_params.view_size = size2;
@@ -1838,7 +1837,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
// to this extra IPC coming in.
InputMsg_HandleInputEvent::Param params;
InputMsg_HandleInputEvent::Read(msg, &params);
- const blink::WebInputEvent* event = base::get<0>(params);
+ const blink::WebInputEvent* event = std::get<0>(params);
EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type);
break;
}
@@ -1848,7 +1847,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
EXPECT_FALSE(has_resize);
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(msg, &params);
- EXPECT_EQ(size3.ToString(), base::get<0>(params).new_size.ToString());
+ EXPECT_EQ(size3.ToString(), std::get<0>(params).new_size.ToString());
has_resize = true;
break;
}
@@ -2605,7 +2604,7 @@ TEST_F(RenderWidgetHostViewAuraTest, VisibleViewportTest) {
ViewMsg_Resize::Param params;
ViewMsg_Resize::Read(message, &params);
- EXPECT_EQ(60, base::get<0>(params).visible_viewport_size.height());
+ EXPECT_EQ(60, std::get<0>(params).visible_viewport_size.height());
}
// Ensures that touch event positions are never truncated to integers.
@@ -4333,7 +4332,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SurfaceIdNamespaceInitialized) {
view_->SetSize(size);
view_->OnSwapCompositorFrame(0,
MakeDelegatedFrame(1.f, size, gfx::Rect(size)));
- EXPECT_EQ(view_->GetSurfaceIdNamespace(), base::get<0>(params));
+ EXPECT_EQ(view_->GetSurfaceIdNamespace(), std::get<0>(params));
}
// This class provides functionality to test a RenderWidgetHostViewAura
« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698