| 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 cadb51ffda6b52152bb959fedb7521882984f7e6..b3fecbbaf8ac7f1c6140f560b21f73792e165649 100644
|
| --- a/content/renderer/external_popup_menu_browsertest.cc
|
| +++ b/content/renderer/external_popup_menu_browsertest.cc
|
| @@ -86,10 +86,10 @@ TEST_F(ExternalPopupMenuTest, NormalCase) {
|
| const IPC::Message* message =
|
| sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| - Tuple1<FrameHostMsg_ShowPopup_Params> param;
|
| + Tuple<FrameHostMsg_ShowPopup_Params> param;
|
| FrameHostMsg_ShowPopup::Read(message, ¶m);
|
| - ASSERT_EQ(3U, param.a.popup_items.size());
|
| - EXPECT_EQ(1, param.a.selected_item);
|
| + ASSERT_EQ(3U, get<0>(param).popup_items.size());
|
| + EXPECT_EQ(1, get<0>(param).selected_item);
|
|
|
| // Simulate the user canceling the popup; the index should not have changed.
|
| frame()->OnSelectPopupMenuItem(-1);
|
| @@ -106,8 +106,8 @@ TEST_F(ExternalPopupMenuTest, NormalCase) {
|
| message = sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| FrameHostMsg_ShowPopup::Read(message, ¶m);
|
| - ASSERT_EQ(3U, param.a.popup_items.size());
|
| - EXPECT_EQ(0, param.a.selected_item);
|
| + ASSERT_EQ(3U, get<0>(param).popup_items.size());
|
| + EXPECT_EQ(0, get<0>(param).selected_item);
|
| }
|
|
|
| // Page shows popup, then navigates away while popup showing, then select.
|
| @@ -189,11 +189,11 @@ TEST_F(ExternalPopupMenuDisplayNoneTest, SelectItem) {
|
| const IPC::Message* message =
|
| sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
|
| ASSERT_TRUE(message != NULL);
|
| - Tuple1<FrameHostMsg_ShowPopup_Params> param;
|
| + 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, param.a.popup_items.size());
|
| + ASSERT_EQ(5U, get<0>(param).popup_items.size());
|
|
|
| // Select index 1 item. This should select item with index 2,
|
| // skipping the item with 'display: none'
|
|
|