Remove base::Tuple

content/renderer/external_popup_menu_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // 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"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ skipping 65 matching lines @@
 TEST_F(ExternalPopupMenuTest, NormalCase) {
   IPC::TestSink& sink = render_thread_->sink();
 
   // Click the text field once.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // We should have sent a message to the browser to show the popup menu.
   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, &param);
-  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);
   EXPECT_EQ(1, GetSelectedIndex());
 
   // Show the pop-up again and this time make a selection.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
   frame()->OnSelectPopupMenuItem(0);
   EXPECT_EQ(0, GetSelectedIndex());
 
   // Show the pop-up again and make another selection.
   sink.ClearMessages();
   EXPECT_TRUE(SimulateElementClick(kSelectID));
   message = sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
   ASSERT_TRUE(message != NULL);
   FrameHostMsg_ShowPopup::Read(message, &param);
-  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.
 TEST_F(ExternalPopupMenuTest, ShowPopupThenNavigate) {
   // Click the text field once.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Now we navigate to another pager.
   LoadHTML("<blink>Awesome page!</blink>");
 
@@ skipping 61 matching lines @@
 TEST_F(ExternalPopupMenuDisplayNoneTest, SelectItem) {
   IPC::TestSink& sink = render_thread_->sink();
 
   // Click the text field once to show the popup.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Read the message sent to browser to show the popup menu.
   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, &param);
   // 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'
   frame()->OnSelectPopupMenuItem(1);
 
   EXPECT_EQ(2, GetSelectedIndex());
 }
 
 }  // namespace content