| Index: content/renderer/external_popup_menu_browsertest.cc
|
| diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc
|
| index ea6054b92d36029a0359ac636532daf3d69e5151..d1eb5a4520d034ab5aa54927e8cdc6cdb6540713 100644
|
| --- a/content/renderer/external_popup_menu_browsertest.cc
|
| +++ b/content/renderer/external_popup_menu_browsertest.cc
|
| @@ -2,6 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <tuple>
|
| +
|
| #include "base/macros.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "content/common/frame_messages.h"
|
| @@ -87,10 +89,10 @@ TEST_F(ExternalPopupMenuTest, NormalCase) {
|
| const IPC::Message* message =
|
| sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| - base::Tuple<FrameHostMsg_ShowPopup_Params> param;
|
| + std::tuple<FrameHostMsg_ShowPopup_Params> param;
|
| FrameHostMsg_ShowPopup::Read(message, ¶m);
|
| - ASSERT_EQ(3U, base::get<0>(param).popup_items.size());
|
| - EXPECT_EQ(1, base::get<0>(param).selected_item);
|
| + ASSERT_EQ(3U, std::get<0>(param).popup_items.size());
|
| + EXPECT_EQ(1, std::get<0>(param).selected_item);
|
|
|
| // Simulate the user canceling the popup; the index should not have changed.
|
| frame()->OnSelectPopupMenuItem(-1);
|
| @@ -107,8 +109,8 @@ TEST_F(ExternalPopupMenuTest, NormalCase) {
|
| message = sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| FrameHostMsg_ShowPopup::Read(message, ¶m);
|
| - ASSERT_EQ(3U, base::get<0>(param).popup_items.size());
|
| - EXPECT_EQ(0, base::get<0>(param).selected_item);
|
| + ASSERT_EQ(3U, std::get<0>(param).popup_items.size());
|
| + EXPECT_EQ(0, std::get<0>(param).selected_item);
|
| }
|
|
|
| // Page shows popup, then navigates away while popup showing, then select.
|
| @@ -190,11 +192,11 @@ TEST_F(ExternalPopupMenuDisplayNoneTest, SelectItem) {
|
| const IPC::Message* message =
|
| sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| - base::Tuple<FrameHostMsg_ShowPopup_Params> param;
|
| + std::tuple<FrameHostMsg_ShowPopup_Params> param;
|
| FrameHostMsg_ShowPopup::Read(message, ¶m);
|
| // Number of items should match item count minus the number
|
| // of "display: none" items.
|
| - ASSERT_EQ(5U, base::get<0>(param).popup_items.size());
|
| + ASSERT_EQ(5U, std::get<0>(param).popup_items.size());
|
|
|
| // Select index 1 item. This should select item with index 2,
|
| // skipping the item with 'display: none'
|
|
|