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