Replace base::Tuple in //chrome with std::tuple

BUG=554987

Review URL: https://codereview.chromium.org/1767343004

Cr-Commit-Position: refs/heads/master@{#380085}

20 files changed, 125 insertions, 102 deletions

diff --git a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
index 16f1ac4..b4c25c9 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
 
+#include <tuple>
 #include <vector>
 
 #include "base/macros.h"
@@ -74,7 +75,7 @@ class AppShimHostTest : public testing::Test,
     EXPECT_EQ(AppShimMsg_LaunchApp_Done::ID, message->type());
     AppShimMsg_LaunchApp_Done::Param param;
     AppShimMsg_LaunchApp_Done::Read(message, &param);
-    return base::get<0>(param);
+    return std::get<0>(param);
   }
 
   void SimulateDisconnect() {
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc
index 53f163d..528df68 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h"
 
+#include <tuple>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/values_test_util.h"
@@ -72,7 +74,7 @@ class DeclarativeContentCssConditionTrackerTest
     ASSERT_TRUE(message);
     ExtensionMsg_WatchPages::Param params;
     ExtensionMsg_WatchPages::Read(message, &params);
-    EXPECT_THAT(base::get<0>(params), UnorderedElementsAreArray(selectors));
+    EXPECT_THAT(std::get<0>(params), UnorderedElementsAreArray(selectors));
   }
 
   // Expects no ExtensionMsg_WatchPages message in |sink| after invoking |func|.
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index a3c4a1f1..5ee161f 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <queue>
+#include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -127,9 +128,9 @@ void GetPartOfMessageArguments(IPC::Message* message,
                                ExtensionMsg_MessageInvoke::Param* param) {
   ASSERT_EQ(ExtensionMsg_MessageInvoke::ID, message->type());
   ASSERT_TRUE(ExtensionMsg_MessageInvoke::Read(message, param));
-  ASSERT_GE(base::get<3>(*param).GetSize(), 2u);
+  ASSERT_GE(std::get<3>(*param).GetSize(), 2u);
   const base::Value* value = NULL;
-  ASSERT_TRUE(base::get<3>(*param).Get(1, &value));
+  ASSERT_TRUE(std::get<3>(*param).Get(1, &value));
   const base::ListValue* list = NULL;
   ASSERT_TRUE(value->GetAsList(&list));
   ASSERT_EQ(1u, list->GetSize());
@@ -1007,7 +1008,7 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) {
       continue;
     ExtensionMsg_MessageInvoke::Param message_tuple;
     ExtensionMsg_MessageInvoke::Read(message, &message_tuple);
-    base::ListValue& args = base::get<3>(message_tuple);
+    base::ListValue& args = std::get<3>(message_tuple);
 
     std::string event_name;
     if (!args.GetString(0, &event_name) ||
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index 4989deb..d1f0ff6 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <tuple>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ -130,9 +131,9 @@ bool ChromePasswordManagerClientTest::WasLoggingActivationMessageSent(
       process()->sink().GetFirstMessageMatching(kMsgID);
   if (!message)
     return false;
-  base::Tuple<bool> param;
+  std::tuple<bool> param;
   AutofillMsg_SetLoggingState::Read(message, &param);
-  *activation_flag = base::get<0>(param);
+  *activation_flag = std::get<0>(param);
   process()->sink().ClearMessages();
   return true;
 }
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 0438fd7..f025b29 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 
+#include <tuple>
 #include <utility>
 
 #include "base/files/file_path.h"
@@ -329,9 +330,9 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
         SafeBrowsingMsg_StartPhishingDetection::ID);
     if (url) {
       ASSERT_TRUE(msg);
-      base::Tuple<GURL> actual_url;
+      std::tuple<GURL> actual_url;
       SafeBrowsingMsg_StartPhishingDetection::Read(msg, &actual_url);
-      EXPECT_EQ(*url, base::get<0>(actual_url));
+      EXPECT_EQ(*url, std::get<0>(actual_url));
       EXPECT_EQ(main_rfh()->GetRoutingID(), msg->routing_id());
       process()->sink().ClearMessages();
     } else {
diff --git a/chrome/browser/search/instant_service_unittest.cc b/chrome/browser/search/instant_service_unittest.cc
index e2836f3..7bac411 100644
--- a/chrome/browser/search/instant_service_unittest.cc
+++ b/chrome/browser/search/instant_service_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ -112,8 +113,8 @@ TEST_F(InstantServiceEnabledTest, SendsSearchURLsToRenderer) {
   ASSERT_TRUE(msg);
   ChromeViewMsg_SetSearchURLs::Param params;
   ChromeViewMsg_SetSearchURLs::Read(msg, &params);
-  std::vector<GURL> search_urls = base::get<0>(params);
-  GURL new_tab_page_url = base::get<1>(params);
+  std::vector<GURL> search_urls = std::get<0>(params);
+  GURL new_tab_page_url = std::get<1>(params);
   EXPECT_EQ(2U, search_urls.size());
   EXPECT_EQ("https://www.google.com/alt#quux=", search_urls[0].spec());
   EXPECT_EQ("https://www.google.com/url?bar=", search_urls[1].spec());
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc
index 4e15232..5d7213b 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
 
+#include <tuple>
+
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
@@ -53,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SpellCheckMessageFilterPlatformMacBrowserTest,
   SpellCheckMsg_RespondTextCheck::Param params;
   bool ok = SpellCheckMsg_RespondTextCheck::Read(
       target->sent_messages_[0], &params);
-  std::vector<SpellCheckResult> sent_results = base::get<2>(params);
+  std::vector<SpellCheckResult> sent_results = std::get<2>(params);
 
   EXPECT_TRUE(ok);
   EXPECT_EQ(1U, sent_results.size());
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc
index 66a04dc..d6692a1 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc
@@ -5,6 +5,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <tuple>
+
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -108,10 +110,10 @@ TEST(SpellCheckMessageFilterTest, OnTextCheckCompleteTestCustomDictionary) {
   SpellCheckMsg_RespondSpellingService::Param params;
   bool ok = SpellCheckMsg_RespondSpellingService::Read(
       filter->sent_messages[0], &params);
-  int sent_identifier = base::get<0>(params);
-  bool sent_success = base::get<1>(params);
-  base::string16 sent_text = base::get<2>(params);
-  std::vector<SpellCheckResult> sent_results = base::get<3>(params);
+  int sent_identifier = std::get<0>(params);
+  bool sent_success = std::get<1>(params);
+  base::string16 sent_text = std::get<2>(params);
+  std::vector<SpellCheckResult> sent_results = std::get<3>(params);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kCallbackId, sent_identifier);
   EXPECT_EQ(kSuccess, sent_success);
@@ -139,8 +141,8 @@ TEST(SpellCheckMessageFilterTest, OnTextCheckCompleteTest) {
   SpellCheckMsg_RespondSpellingService::Param params;
   bool ok = SpellCheckMsg_RespondSpellingService::Read(
       filter->sent_messages[0], & params);
-  base::string16 sent_text = base::get<2>(params);
-  std::vector<SpellCheckResult> sent_results = base::get<3>(params);
+  base::string16 sent_text = std::get<2>(params);
+  std::vector<SpellCheckResult> sent_results = std::get<3>(params);
   EXPECT_TRUE(ok);
   EXPECT_EQ(static_cast<size_t>(2), sent_results.size());
 }
diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
index 4459884..0a3bd75 100644
--- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
+++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/command_line.h"
@@ -16,7 +17,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/tuple.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -155,7 +155,7 @@ class SpellcheckServiceBrowserTest : public InProcessBrowserTest {
     if (!ok)
       return false;
 
-    return base::get<0>(param);
+    return std::get<0>(param);
   }
 
  private:
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index 227389e..db5e585 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -5,6 +5,7 @@
 #include <stddef.h>
 #include <algorithm>
 #include <set>
+#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -260,14 +261,14 @@ class TranslateManagerRenderViewHostTest
         ChromeFrameMsg_TranslatePage::ID);
     if (!message)
       return false;
-    base::Tuple<int, std::string, std::string, std::string> translate_param;
+    std::tuple<int, std::string, std::string, std::string> translate_param;
     ChromeFrameMsg_TranslatePage::Read(message, &translate_param);
     // Ignore get<0>(translate_param) which is the page seq no.
     // Ignore get<1>(translate_param) which is the script injected in the page.
     if (original_lang)
-      *original_lang = base::get<2>(translate_param);
+      *original_lang = std::get<2>(translate_param);
     if (target_lang)
-      *target_lang = base::get<3>(translate_param);
+      *target_lang = std::get<3>(translate_param);
     return true;
   }
 
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index f0432bf..bef3048 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include <stdint.h>
+#include <tuple>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -533,13 +534,13 @@ TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
   ASSERT_TRUE(message);
 
   // Verify the IPC message params.
-  base::Tuple<base::string16, EmbeddedSearchRequestParams> params;
+  std::tuple<base::string16, EmbeddedSearchRequestParams> params;
   ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
-  EXPECT_EQ("foo", base::UTF16ToASCII(base::get<0>(params)));
-  EXPECT_EQ("f", base::UTF16ToASCII(base::get<1>(params).original_query));
-  EXPECT_EQ("utf-8", base::UTF16ToASCII(base::get<1>(params).input_encoding));
-  EXPECT_EQ("", base::UTF16ToASCII(base::get<1>(params).rlz_parameter_value));
+  EXPECT_EQ("foo", base::UTF16ToASCII(std::get<0>(params)));
+  EXPECT_EQ("f", base::UTF16ToASCII(std::get<1>(params).original_query));
+  EXPECT_EQ("utf-8", base::UTF16ToASCII(std::get<1>(params).input_encoding));
+  EXPECT_EQ("", base::UTF16ToASCII(std::get<1>(params).rlz_parameter_value));
   EXPECT_EQ("chrome...0",
-            base::UTF16ToASCII(base::get<1>(params).assisted_query_stats));
+            base::UTF16ToASCII(std::get<1>(params).assisted_query_stats));
 }
 #endif
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index 081409b..0fd54b1 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 
+#include <tuple>
 #include <vector>
 
 #include "base/command_line.h"
@@ -13,7 +14,6 @@
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/tuple.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -159,11 +159,11 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
     const IPC::Message* message = process()->sink().GetFirstMessageMatching(
         ChromeViewMsg_SearchBoxSetDisplayInstantResults::ID);
     EXPECT_NE(static_cast<const IPC::Message*>(NULL), message);
-    base::Tuple<bool> display_instant_results_param;
+    std::tuple<bool> display_instant_results_param;
     ChromeViewMsg_SearchBoxSetDisplayInstantResults::Read(
         message, &display_instant_results_param);
     EXPECT_EQ(expected_param_value,
-              base::get<0>(display_instant_results_param));
+              std::get<0>(display_instant_results_param));
   }
 
   MockSearchIPCRouterDelegate* mock_delegate() { return &delegate_; }
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index 98e05ff..f097281 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <tuple>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ -193,8 +194,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatch) {
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, base::get<0>(params));
-  ASSERT_TRUE(base::get<1>(params));
+  EXPECT_EQ(test_identity, std::get<0>(params));
+  ASSERT_TRUE(std::get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatchSlightlyDifferentGmail) {
@@ -216,8 +217,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatchSlightlyDifferentGmail) {
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, base::get<0>(params));
-  ASSERT_TRUE(base::get<1>(params));
+  EXPECT_EQ(test_identity, std::get<0>(params));
+  ASSERT_TRUE(std::get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatchSlightlyDifferentGmail2) {
@@ -240,8 +241,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatchSlightlyDifferentGmail2) {
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, base::get<0>(params));
-  ASSERT_TRUE(base::get<1>(params));
+  EXPECT_EQ(test_identity, std::get<0>(params));
+  ASSERT_TRUE(std::get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {
@@ -260,8 +261,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, base::get<0>(params));
-  ASSERT_FALSE(base::get<1>(params));
+  EXPECT_EQ(test_identity, std::get<0>(params));
+  ASSERT_FALSE(std::get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
@@ -280,8 +281,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, base::get<0>(params));
-  ASSERT_FALSE(base::get<1>(params));
+  EXPECT_EQ(test_identity, std::get<0>(params));
+  ASSERT_FALSE(std::get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {
@@ -299,7 +300,7 @@ TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {
 
   ChromeViewMsg_HistorySyncCheckResult::Param params;
   ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
-  ASSERT_TRUE(base::get<0>(params));
+  ASSERT_TRUE(std::get<0>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnHistorySyncCheckNotSyncing) {
@@ -317,7 +318,7 @@ TEST_F(SearchTabHelperTest, OnHistorySyncCheckNotSyncing) {
 
   ChromeViewMsg_HistorySyncCheckResult::Param params;
   ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
-  ASSERT_FALSE(base::get<0>(params));
+  ASSERT_FALSE(std::get<0>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnMostVisitedItemsChangedFromServer) {
diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h
index b405451..9258047 100644
--- a/chrome/common/chrome_utility_messages.h
+++ b/chrome/common/chrome_utility_messages.h
@@ -9,11 +9,11 @@
 #endif  // defined(OS_WIN)
 
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
-#include "base/tuple.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "ipc/ipc_message_macros.h"
@@ -32,9 +32,9 @@
 #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 
 #if defined(OS_WIN)
-// A vector of filters, each being a Tuple containing a display string (i.e.
+// A vector of filters, each being a tuple containing a display string (i.e.
 // "Text Files") and a filter pattern (i.e. "*.txt").
-typedef std::vector<base::Tuple<base::string16, base::string16>>
+typedef std::vector<std::tuple<base::string16, base::string16>>
     GetOpenFileNameFilter;
 #endif  // OS_WIN
 
diff --git a/chrome/renderer/autofill/autofill_renderer_browsertest.cc b/chrome/renderer/autofill/autofill_renderer_browsertest.cc
index f8840c3..314df42 100644
--- a/chrome/renderer/autofill/autofill_renderer_browsertest.cc
+++ b/chrome/renderer/autofill/autofill_renderer_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/command_line.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
@@ -38,8 +40,8 @@ using blink::WebVector;
 
 namespace autofill {
 
-typedef base::Tuple<int, autofill::FormData, autofill::FormFieldData,
-                    gfx::RectF> AutofillQueryParam;
+using AutofillQueryParam =
+    std::tuple<int, autofill::FormData, autofill::FormFieldData, gfx::RectF>;
 
 class AutofillRendererTest : public ChromeRenderViewTest {
  public:
@@ -87,7 +89,7 @@ TEST_F(AutofillRendererTest, SendForms) {
   ASSERT_NE(nullptr, message);
   AutofillHostMsg_FormsSeen::Param params;
   AutofillHostMsg_FormsSeen::Read(message, &params);
-  std::vector<FormData> forms = base::get<0>(params);
+  std::vector<FormData> forms = std::get<0>(params);
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(4UL, forms[0].fields.size());
 
@@ -150,7 +152,7 @@ TEST_F(AutofillRendererTest, SendForms) {
       AutofillHostMsg_FormsSeen::ID);
   ASSERT_NE(nullptr, message);
   AutofillHostMsg_FormsSeen::Read(message, &params);
-  forms = base::get<0>(params);
+  forms = std::get<0>(params);
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(3UL, forms[0].fields.size());
 
@@ -182,7 +184,7 @@ TEST_F(AutofillRendererTest, EnsureNoFormSeenIfTooFewFields) {
   ASSERT_NE(nullptr, message);
   AutofillHostMsg_FormsSeen::Param params;
   AutofillHostMsg_FormsSeen::Read(message, &params);
-  const std::vector<FormData>& forms = base::get<0>(params);
+  const std::vector<FormData>& forms = std::get<0>(params);
   ASSERT_EQ(0UL, forms.size());
 }
 
@@ -215,7 +217,7 @@ TEST_F(AutofillRendererTest, DynamicallyAddedUnownedFormElements) {
   ASSERT_NE(nullptr, message);
   AutofillHostMsg_FormsSeen::Param params;
   AutofillHostMsg_FormsSeen::Read(message, &params);
-  std::vector<FormData> forms = base::get<0>(params);
+  std::vector<FormData> forms = std::get<0>(params);
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(7UL, forms[0].fields.size());
 
@@ -228,7 +230,7 @@ TEST_F(AutofillRendererTest, DynamicallyAddedUnownedFormElements) {
       AutofillHostMsg_FormsSeen::ID);
   ASSERT_NE(nullptr, message);
   AutofillHostMsg_FormsSeen::Read(message, &params);
-  forms = base::get<0>(params);
+  forms = std::get<0>(params);
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(9UL, forms[0].fields.size());
 
diff --git a/chrome/renderer/autofill/form_autocomplete_browsertest.cc b/chrome/renderer/autofill/form_autocomplete_browsertest.cc
index ebe1a84..f2401b6 100644
--- a/chrome/renderer/autofill/form_autocomplete_browsertest.cc
+++ b/chrome/renderer/autofill/form_autocomplete_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/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ -45,27 +47,27 @@ void VerifyReceivedRendererMessages(content::MockRenderThread* render_thread,
   ASSERT_EQ(expect_submitted_message, submitted_message != NULL);
 
   // The tuple also includes a timestamp, which is ignored.
-  base::Tuple<FormData, base::TimeTicks> will_submit_forms;
+  std::tuple<FormData, base::TimeTicks> will_submit_forms;
   AutofillHostMsg_WillSubmitForm::Read(will_submit_message, &will_submit_forms);
-  ASSERT_EQ(2U, base::get<0>(will_submit_forms).fields.size());
+  ASSERT_EQ(2U, std::get<0>(will_submit_forms).fields.size());
 
   FormFieldData& will_submit_form_field =
-      base::get<0>(will_submit_forms).fields[0];
+      std::get<0>(will_submit_forms).fields[0];
   EXPECT_EQ(WebString("fname"), will_submit_form_field.name);
   EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), will_submit_form_field.value);
-  will_submit_form_field = base::get<0>(will_submit_forms).fields[1];
+  will_submit_form_field = std::get<0>(will_submit_forms).fields[1];
   EXPECT_EQ(WebString("lname"), will_submit_form_field.name);
   EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), will_submit_form_field.value);
 
   if (expect_submitted_message) {
-    base::Tuple<FormData> submitted_forms;
+    std::tuple<FormData> submitted_forms;
     AutofillHostMsg_FormSubmitted::Read(submitted_message, &submitted_forms);
-    ASSERT_EQ(2U, base::get<0>(submitted_forms).fields.size());
+    ASSERT_EQ(2U, std::get<0>(submitted_forms).fields.size());
 
-    FormFieldData& submitted_field = base::get<0>(submitted_forms).fields[0];
+    FormFieldData& submitted_field = std::get<0>(submitted_forms).fields[0];
     EXPECT_EQ(WebString("fname"), submitted_field.name);
     EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), submitted_field.value);
-    submitted_field = base::get<0>(submitted_forms).fields[1];
+    submitted_field = std::get<0>(submitted_forms).fields[1];
     EXPECT_EQ(WebString("lname"), submitted_field.name);
     EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), submitted_field.value);
   }
diff --git a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
index 129b6f7..c1c12b2 100644
--- a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
+++ b/chrome/renderer/autofill/password_autofill_agent_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/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -440,13 +442,13 @@ class PasswordAutofillAgentTest : public ChromeRenderViewTest {
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_ShowPasswordSuggestions::ID);
     ASSERT_TRUE(message);
-    base::Tuple<int, base::i18n::TextDirection, base::string16, int, gfx::RectF>
+    std::tuple<int, base::i18n::TextDirection, base::string16, int, gfx::RectF>
         args;
     AutofillHostMsg_ShowPasswordSuggestions::Read(message, &args);
-    EXPECT_EQ(kPasswordFillFormDataId, base::get<0>(args));
-    EXPECT_EQ(ASCIIToUTF16(username), base::get<2>(args));
+    EXPECT_EQ(kPasswordFillFormDataId, std::get<0>(args));
+    EXPECT_EQ(ASCIIToUTF16(username), std::get<2>(args));
     EXPECT_EQ(show_all,
-              static_cast<bool>(base::get<3>(args) & autofill::SHOW_ALL));
+              static_cast<bool>(std::get<3>(args) & autofill::SHOW_ALL));
 
     render_thread_->sink().ClearMessages();
   }
@@ -459,12 +461,12 @@ class PasswordAutofillAgentTest : public ChromeRenderViewTest {
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_PasswordFormSubmitted::ID);
     ASSERT_TRUE(message);
-    base::Tuple<autofill::PasswordForm> args;
+    std::tuple<autofill::PasswordForm> args;
     AutofillHostMsg_PasswordFormSubmitted::Read(message, &args);
-    EXPECT_EQ(ASCIIToUTF16(username_value), base::get<0>(args).username_value);
-    EXPECT_EQ(ASCIIToUTF16(password_value), base::get<0>(args).password_value);
+    EXPECT_EQ(ASCIIToUTF16(username_value), std::get<0>(args).username_value);
+    EXPECT_EQ(ASCIIToUTF16(password_value), std::get<0>(args).password_value);
     EXPECT_EQ(ASCIIToUTF16(new_password_value),
-              base::get<0>(args).new_password_value);
+              std::get<0>(args).new_password_value);
   }
 
   void ExpectInPageNavigationWithUsernameAndPasswords(
@@ -475,12 +477,12 @@ class PasswordAutofillAgentTest : public ChromeRenderViewTest {
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_InPageNavigation::ID);
     ASSERT_TRUE(message);
-    base::Tuple<autofill::PasswordForm> args;
+    std::tuple<autofill::PasswordForm> args;
     AutofillHostMsg_InPageNavigation::Read(message, &args);
-    EXPECT_EQ(ASCIIToUTF16(username_value), base::get<0>(args).username_value);
-    EXPECT_EQ(ASCIIToUTF16(password_value), base::get<0>(args).password_value);
+    EXPECT_EQ(ASCIIToUTF16(username_value), std::get<0>(args).username_value);
+    EXPECT_EQ(ASCIIToUTF16(password_value), std::get<0>(args).password_value);
     EXPECT_EQ(ASCIIToUTF16(new_password_value),
-              base::get<0>(args).new_password_value);
+              std::get<0>(args).new_password_value);
   }
 
   base::string16 username1_;
@@ -515,7 +517,7 @@ TEST_F(PasswordAutofillAgentTest, InitialAutocomplete) {
       AutofillHostMsg_PasswordFormsParsed::ID);
   ASSERT_TRUE(msg != NULL);
 
-  base::Tuple1<std::vector<PasswordForm> > forms;
+  std::tuple<std::vector<PasswordForm> > forms;
   AutofillHostMsg_PasswordFormsParsed::Read(msg, &forms);
   ASSERT_EQ(1U, forms.a.size());
   PasswordForm password_form = forms.a[0];
@@ -780,9 +782,9 @@ TEST_F(PasswordAutofillAgentTest, SendPasswordFormsTest) {
   const IPC::Message* message = render_thread_->sink()
       .GetFirstMessageMatching(AutofillHostMsg_PasswordFormsRendered::ID);
   EXPECT_TRUE(message);
-  base::Tuple<std::vector<autofill::PasswordForm>, bool> param;
+  std::tuple<std::vector<autofill::PasswordForm>, bool> param;
   AutofillHostMsg_PasswordFormsRendered::Read(message, &param);
-  EXPECT_TRUE(base::get<0>(param).size());
+  EXPECT_TRUE(std::get<0>(param).size());
 
   render_thread_->sink().ClearMessages();
   LoadHTML(kEmptyFormHTML);
@@ -790,7 +792,7 @@ TEST_F(PasswordAutofillAgentTest, SendPasswordFormsTest) {
       AutofillHostMsg_PasswordFormsRendered::ID);
   EXPECT_TRUE(message);
   AutofillHostMsg_PasswordFormsRendered::Read(message, &param);
-  EXPECT_FALSE(base::get<0>(param).size());
+  EXPECT_FALSE(std::get<0>(param).size());
 
   render_thread_->sink().ClearMessages();
   LoadHTML(kNonVisibleFormHTML);
@@ -798,7 +800,7 @@ TEST_F(PasswordAutofillAgentTest, SendPasswordFormsTest) {
       AutofillHostMsg_PasswordFormsRendered::ID);
   EXPECT_TRUE(message);
   AutofillHostMsg_PasswordFormsRendered::Read(message, &param);
-  EXPECT_FALSE(base::get<0>(param).size());
+  EXPECT_FALSE(std::get<0>(param).size());
 }
 
 TEST_F(PasswordAutofillAgentTest, SendPasswordFormsTest_Redirection) {
diff --git a/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc b/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
index a9940b6..f1dcaae 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <tuple>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
@@ -23,7 +24,7 @@ void FakeMessageArrival(
   bool handled = provider->OnMessageReceived(
       SpellCheckMsg_RespondTextCheck(
           0,
-          base::get<1>(parameters),
+          std::get<1>(parameters),
           base::ASCIIToUTF16("test"),
           fake_result));
   EXPECT_TRUE(handled);
@@ -43,7 +44,7 @@ TEST_F(SpellCheckProviderMacTest, SingleRoundtripSuccess) {
   bool ok = SpellCheckHostMsg_RequestTextCheck::Read(
       provider_.messages_[0], &read_parameters1);
   EXPECT_TRUE(ok);
-  EXPECT_EQ(base::get<2>(read_parameters1), base::UTF8ToUTF16("hello "));
+  EXPECT_EQ(std::get<2>(read_parameters1), base::UTF8ToUTF16("hello "));
 
   FakeMessageArrival(&provider_, read_parameters1);
   EXPECT_EQ(completion.completion_count_, 1U);
@@ -69,13 +70,13 @@ TEST_F(SpellCheckProviderMacTest, TwoRoundtripSuccess) {
   bool ok = SpellCheckHostMsg_RequestTextCheck::Read(
       provider_.messages_[0], &read_parameters1);
   EXPECT_TRUE(ok);
-  EXPECT_EQ(base::get<2>(read_parameters1), base::UTF8ToUTF16("hello "));
+  EXPECT_EQ(std::get<2>(read_parameters1), base::UTF8ToUTF16("hello "));
 
   SpellCheckHostMsg_RequestTextCheck::Param read_parameters2;
   ok = SpellCheckHostMsg_RequestTextCheck::Read(
       provider_.messages_[1], &read_parameters2);
   EXPECT_TRUE(ok);
-  EXPECT_EQ(base::get<2>(read_parameters2), base::UTF8ToUTF16("bye "));
+  EXPECT_EQ(std::get<2>(read_parameters2), base::UTF8ToUTF16("bye "));
 
   FakeMessageArrival(&provider_, read_parameters1);
   EXPECT_EQ(completion1.completion_count_, 1U);
diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc
index da914f7..64f8def 100644
--- a/chrome/renderer/translate/translate_helper_browsertest.cc
+++ b/chrome/renderer/translate/translate_helper_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/time/time.h"
 #include "chrome/common/chrome_isolated_world_ids.h"
@@ -79,15 +81,15 @@ class TranslateHelperBrowserTest : public ChromeRenderViewTest {
             ChromeFrameHostMsg_PageTranslated::ID);
     if (!message)
       return false;
-    base::Tuple<std::string, std::string, translate::TranslateErrors::Type>
+    std::tuple<std::string, std::string, translate::TranslateErrors::Type>
         translate_param;
     ChromeFrameHostMsg_PageTranslated::Read(message, &translate_param);
     if (original_lang)
-      *original_lang = base::get<0>(translate_param);
+      *original_lang = std::get<0>(translate_param);
     if (target_lang)
-      *target_lang = base::get<1>(translate_param);
+      *target_lang = std::get<1>(translate_param);
     if (error)
-      *error = base::get<2>(translate_param);
+      *error = std::get<2>(translate_param);
     return true;
   }
 
@@ -331,7 +333,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_TRUE(base::get<1>(params)) << "Page should be translatable.";
+  EXPECT_TRUE(std::get<1>(params)) << "Page should be translatable.";
   render_thread_->sink().ClearMessages();
 
   // Now the page specifies the META tag to prevent translation.
@@ -341,7 +343,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_FALSE(base::get<1>(params)) << "Page should not be translatable.";
+  EXPECT_FALSE(std::get<1>(params)) << "Page should not be translatable.";
   render_thread_->sink().ClearMessages();
 
   // Try the alternate version of the META tag (content instead of value).
@@ -351,7 +353,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_FALSE(base::get<1>(params)) << "Page should not be translatable.";
+  EXPECT_FALSE(std::get<1>(params)) << "Page should not be translatable.";
 }
 
 // Tests that the language meta tag takes precedence over the CLD when reporting
@@ -368,7 +370,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("es", base::get<0>(params).adopted_language);
+  EXPECT_EQ("es", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 
   // Makes sure we support multiple languages specified.
@@ -379,7 +381,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+  EXPECT_EQ("fr", std::get<0>(params).adopted_language);
 }
 
 // Tests that the language meta tag works even with non-all-lower-case.
@@ -396,7 +398,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("es", base::get<0>(params).adopted_language);
+  EXPECT_EQ("es", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 
   // Makes sure we support multiple languages specified.
@@ -407,7 +409,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+  EXPECT_EQ("fr", std::get<0>(params).adopted_language);
 }
 
 // Tests that the language meta tag is converted to Chrome standard of dashes
@@ -425,7 +427,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("en", base::get<0>(params).adopted_language);
+  EXPECT_EQ("en", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 
   LoadHTML("<html><head><meta http-equiv='Content-Language' content='ZH_tw'>"
@@ -434,7 +436,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("zh-TW", base::get<0>(params).adopted_language);
+  EXPECT_EQ("zh-TW", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 }
 
@@ -448,7 +450,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("zh", base::get<0>(params).adopted_language);
+  EXPECT_EQ("zh", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 
   content::PageState back_state = GetCurrentPageState();
@@ -459,7 +461,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+  EXPECT_EQ("fr", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 
   GoBack(back_state);
@@ -468,6 +470,6 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
       ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
-  EXPECT_EQ("zh", base::get<0>(params).adopted_language);
+  EXPECT_EQ("zh", std::get<0>(params).adopted_language);
   render_thread_->sink().ClearMessages();
 }
diff --git a/chrome/utility/shell_handler_win.h b/chrome/utility/shell_handler_win.h
index 63f16f4..3647ed4 100644
--- a/chrome/utility/shell_handler_win.h
+++ b/chrome/utility/shell_handler_win.h
@@ -7,20 +7,20 @@
 
 #include <Windows.h>
 
+#include <tuple>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "base/tuple.h"
 #include "chrome/utility/utility_message_handler.h"
 
 namespace base {
 class FilePath;
 }  // namespace base
 
-typedef std::vector<base::Tuple<base::string16, base::string16>>
-    GetOpenFileNameFilter;
+using GetOpenFileNameFilter =
+    std::vector<std::tuple<base::string16, base::string16>>;
 
 struct ChromeUtilityMsg_GetSaveFileName_Params;