| 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 2e3ba90de621495ad622177145b1f9ceac40426c..799a835bc7be2ce17533c4600362d1673b13d0ce 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -780,9 +780,9 @@ TEST_F(RenderWidgetHostTest, Background) {
|
| process_->sink().GetUniqueMessageMatching(
|
| ViewMsg_SetBackgroundOpaque::ID);
|
| ASSERT_TRUE(set_background);
|
| - Tuple1<bool> sent_background;
|
| + Tuple<bool> sent_background;
|
| ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background);
|
| - EXPECT_FALSE(sent_background.a);
|
| + EXPECT_FALSE(get<0>(sent_background));
|
|
|
| #if defined(USE_AURA)
|
| // See the comment above |InitAsChild(NULL)|.
|
| @@ -817,9 +817,9 @@ TEST_F(RenderWidgetHostTest, HiddenPaint) {
|
| const IPC::Message* restored = process_->sink().GetUniqueMessageMatching(
|
| ViewMsg_WasShown::ID);
|
| ASSERT_TRUE(restored);
|
| - Tuple2<bool, ui::LatencyInfo> needs_repaint;
|
| + Tuple<bool, ui::LatencyInfo> needs_repaint;
|
| ViewMsg_WasShown::Read(restored, &needs_repaint);
|
| - EXPECT_TRUE(needs_repaint.a);
|
| + EXPECT_TRUE(get<0>(needs_repaint));
|
| }
|
|
|
| TEST_F(RenderWidgetHostTest, IgnoreKeyEventsHandledByRenderer) {
|
| @@ -1021,7 +1021,7 @@ std::string GetInputMessageTypes(RenderWidgetHostProcess* process) {
|
| EXPECT_EQ(InputMsg_HandleInputEvent::ID, message->type());
|
| InputMsg_HandleInputEvent::Param params;
|
| EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, ¶ms));
|
| - const WebInputEvent* event = params.a;
|
| + const WebInputEvent* event = get<0>(params);
|
| if (i != 0)
|
| result += " ";
|
| result += WebInputEventTraits::GetName(event->type);
|
| @@ -1343,7 +1343,7 @@ ui::LatencyInfo GetLatencyInfoFromInputEvent(RenderWidgetHostProcess* process) {
|
| InputMsg_HandleInputEvent::Param params;
|
| EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, ¶ms));
|
| process->sink().ClearMessages();
|
| - return params.b;
|
| + return get<1>(params);
|
| }
|
|
|
| void CheckLatencyInfoComponentInMessage(RenderWidgetHostProcess* process,
|
|
|