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

BUG=554987

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

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

12 files changed, 78 insertions, 61 deletions

diff --git a/components/autofill/content/browser/content_autofill_driver_unittest.cc b/components/autofill/content/browser/content_autofill_driver_unittest.cc
index 633908f..68fe6f2 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <algorithm>
+#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -94,13 +95,13 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
-    base::Tuple<int, FormData> autofill_param;
+    std::tuple<int, FormData> autofill_param;
     if (!AutofillMsg_FillForm::Read(message, &autofill_param))
       return false;
     if (page_id)
-      *page_id = base::get<0>(autofill_param);
+      *page_id = std::get<0>(autofill_param);
     if (results)
-      *results = base::get<1>(autofill_param);
+      *results = std::get<1>(autofill_param);
     process()->sink().ClearMessages();
     return true;
   }
@@ -115,13 +116,13 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
-    base::Tuple<int, FormData> autofill_param;
+    std::tuple<int, FormData> autofill_param;
     if (!AutofillMsg_PreviewForm::Read(message, &autofill_param))
       return false;
     if (page_id)
-      *page_id = base::get<0>(autofill_param);
+      *page_id = std::get<0>(autofill_param);
     if (results)
-      *results = base::get<1>(autofill_param);
+      *results = std::get<1>(autofill_param);
     process()->sink().ClearMessages();
     return true;
   }
@@ -138,12 +139,12 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
-    base::Tuple<std::vector<FormDataPredictions> > autofill_param;
+    std::tuple<std::vector<FormDataPredictions> > autofill_param;
     if (!AutofillMsg_FieldTypePredictionsAvailable::Read(message,
                                                          &autofill_param))
       return false;
     if (predictions)
-      *predictions = base::get<0>(autofill_param);
+      *predictions = std::get<0>(autofill_param);
 
     process()->sink().ClearMessages();
     return true;
@@ -158,7 +159,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
         process()->sink().GetFirstMessageMatching(messageID);
     if (!message)
       return false;
-    base::Tuple<base::string16> autofill_param;
+    std::tuple<base::string16> autofill_param;
     switch (messageID) {
       case AutofillMsg_FillFieldWithValue::ID:
         if (!AutofillMsg_FillFieldWithValue::Read(message, &autofill_param))
@@ -177,7 +178,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
         NOTREACHED();
     }
     if (value)
-      *value = base::get<0>(autofill_param);
+      *value = std::get<0>(autofill_param);
     process()->sink().ClearMessages();
     return true;
   }
diff --git a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
index 37f5afc..8d9db48 100644
--- a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
+++ b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
@@ -4,6 +4,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include "base/macros.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/request_autocomplete_manager.h"
@@ -125,10 +127,10 @@ class RequestAutocompleteManagerTest :
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
-    base::Tuple<blink::WebFormElement::AutocompleteResult, base::string16,
-                FormData> autofill_param;
+    std::tuple<blink::WebFormElement::AutocompleteResult, base::string16,
+               FormData> autofill_param;
     AutofillMsg_RequestAutocompleteResult::Read(message, &autofill_param);
-    *result = base::get<0>(autofill_param);
+    *result = std::get<0>(autofill_param);
     process()->sink().ClearMessages();
     return true;
   }
diff --git a/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc b/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
index 22cd852..73c2bd8 100644
--- a/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
+++ b/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include "components/autofill/content/common/autofill_messages.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -32,9 +34,9 @@ class TestLogger : public RendererSavePasswordProgressLogger {
     const IPC::Message* message = sink_.GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
-    base::Tuple<std::string> param;
+    std::tuple<std::string> param;
     AutofillHostMsg_RecordSavePasswordProgress::Read(message, &param);
-    *log = base::get<0>(param);
+    *log = std::get<0>(param);
     sink_.ClearMessages();
     return true;
   }
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc
index 5ecc3cc..2c65b08 100644
--- a/components/gcm_driver/gcm_driver_desktop.cc
+++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -1315,17 +1315,17 @@ void GCMDriverDesktop::GetGCMStatisticsFinished(
 
 bool GCMDriverDesktop::TokenTupleComparer::operator()(
     const TokenTuple& a, const TokenTuple& b) const {
-  if (base::get<0>(a) < base::get<0>(b))
+  if (std::get<0>(a) < std::get<0>(b))
     return true;
-  if (base::get<0>(a) > base::get<0>(b))
+  if (std::get<0>(a) > std::get<0>(b))
     return false;
 
-  if (base::get<1>(a) < base::get<1>(b))
+  if (std::get<1>(a) < std::get<1>(b))
     return true;
-  if (base::get<1>(a) > base::get<1>(b))
+  if (std::get<1>(a) > std::get<1>(b))
     return false;
 
-  return base::get<2>(a) < base::get<2>(b);
+  return std::get<2>(a) < std::get<2>(b);
 }
 
 }  // namespace gcm
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h
index a162df1..51f002e 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ -128,7 +129,7 @@ class GCMDriverDesktop : public GCMDriver,
  private:
   class IOWorker;
 
-  typedef base::Tuple<std::string, std::string, std::string> TokenTuple;
+  typedef std::tuple<std::string, std::string, std::string> TokenTuple;
   struct TokenTupleComparer {
     bool operator()(const TokenTuple& a, const TokenTuple& b) const;
   };
diff --git a/components/guest_view/renderer/guest_view_request.cc b/components/guest_view/renderer/guest_view_request.cc
index 45edac4..d0aa061 100644
--- a/components/guest_view/renderer/guest_view_request.cc
+++ b/components/guest_view/renderer/guest_view_request.cc
@@ -4,6 +4,7 @@
 
 #include "components/guest_view/renderer/guest_view_request.h"
 
+#include <tuple>
 #include <utility>
 
 #include "components/guest_view/common/guest_view_messages.h"
@@ -83,7 +84,7 @@ void GuestViewAttachRequest::HandleResponse(const IPC::Message& message) {
     return;
 
   content::RenderView* guest_proxy_render_view =
-      content::RenderView::FromRoutingID(base::get<1>(param));
+      content::RenderView::FromRoutingID(std::get<1>(param));
   // TODO(fsamuel): Should we be reporting an error to JavaScript or DCHECKing?
   if (!guest_proxy_render_view)
     return;
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index d8ac1c7..e1508b3 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -6,6 +6,7 @@
 
 #include <limits.h>
 #include <string.h>
+#include <tuple>
 #include <utility>
 
 #include "base/bind.h"
@@ -809,7 +810,7 @@ void NaClIPCAdapter::SendMessageOnIOThread(scoped_ptr<IPC::Message> message) {
   if (!open_resource_cb_.is_null() &&
       message->type() == PpapiHostMsg_OpenResource::ID &&
       PpapiHostMsg_OpenResource::ReadSendParam(message.get(), &send_params)) {
-    const std::string key = base::get<0>(send_params);
+    const std::string key = std::get<0>(send_params);
     // Both open_resource_cb_ and SaveOpenResourceMessage must be invoked
     // from the I/O thread.
     if (open_resource_cb_.Run(
diff --git a/components/password_manager/content/browser/content_password_manager_driver_unittest.cc b/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
index fc0b460..551fcb5 100644
--- a/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include "base/macros.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/test_autofill_client.h"
@@ -56,9 +58,9 @@ class ContentPasswordManagerDriverTest
         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/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
index e59d4e3..897c484 100644
--- a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "base/bind.h"
@@ -269,7 +270,7 @@ class CredentialManagerDispatcherTest
     CredentialManagerMsg_SendCredential::Read(message, &send_param);
 
     EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY,
-              base::get<1>(send_param).type);
+              std::get<1>(send_param).type);
   }
 
   void ExpectZeroClickSignInSuccess(CredentialType type) {
@@ -287,7 +288,7 @@ class CredentialManagerDispatcherTest
     CredentialManagerMsg_SendCredential::Param send_param;
     CredentialManagerMsg_SendCredential::Read(message, &send_param);
 
-    EXPECT_EQ(type, base::get<1>(send_param).type);
+    EXPECT_EQ(type, std::get<1>(send_param).type);
   }
 
   CredentialManagerDispatcher* dispatcher() { return dispatcher_.get(); }
@@ -547,7 +548,7 @@ TEST_F(CredentialManagerDispatcherTest,
   EXPECT_TRUE(message);
   CredentialManagerMsg_SendCredential::Param param;
   CredentialManagerMsg_SendCredential::Read(message, &param);
-  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, base::get<1>(param).type);
+  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, std::get<1>(param).type);
   process()->sink().ClearMessages();
 }
 
@@ -573,7 +574,7 @@ TEST_F(CredentialManagerDispatcherTest,
   EXPECT_TRUE(message);
   CredentialManagerMsg_SendCredential::Param param;
   CredentialManagerMsg_SendCredential::Read(message, &param);
-  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, base::get<1>(param).type);
+  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, std::get<1>(param).type);
   process()->sink().ClearMessages();
 }
 
@@ -616,7 +617,7 @@ TEST_F(
   CredentialManagerMsg_SendCredential::Param send_param;
   CredentialManagerMsg_SendCredential::Read(message, &send_param);
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY,
-            base::get<1>(send_param).type);
+            std::get<1>(send_param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
@@ -828,7 +829,7 @@ TEST_F(CredentialManagerDispatcherTest,
 
   // With two items in the password store, we shouldn't get credentials back.
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY,
-            base::get<1>(send_param).type);
+            std::get<1>(send_param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
@@ -856,7 +857,7 @@ TEST_F(CredentialManagerDispatcherTest,
   // With two items in the password store, we shouldn't get credentials back,
   // even though only one item has |skip_zero_click| set |false|.
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY,
-            base::get<1>(send_param).type);
+            std::get<1>(send_param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
@@ -885,7 +886,7 @@ TEST_F(CredentialManagerDispatcherTest,
   // We only have cross-origin zero-click credentials; they should not be
   // returned.
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY,
-            base::get<1>(send_param).type);
+            std::get<1>(send_param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
@@ -910,7 +911,7 @@ TEST_F(CredentialManagerDispatcherTest,
   CredentialManagerMsg_RejectCredentialRequest::Param reject_param;
   CredentialManagerMsg_RejectCredentialRequest::Read(message, &reject_param);
   EXPECT_EQ(blink::WebCredentialManagerPendingRequestError,
-            base::get<1>(reject_param));
+            std::get<1>(reject_param));
   EXPECT_CALL(*client_, PromptUserToChooseCredentialsPtr(_, _, _, _))
       .Times(testing::Exactly(1));
   EXPECT_CALL(*client_, NotifyUserAutoSigninPtr(_)).Times(testing::Exactly(0));
@@ -927,7 +928,7 @@ TEST_F(CredentialManagerDispatcherTest,
   CredentialManagerMsg_SendCredential::Param send_param;
   CredentialManagerMsg_SendCredential::Read(message, &send_param);
   EXPECT_NE(CredentialType::CREDENTIAL_TYPE_EMPTY,
-            base::get<1>(send_param).type);
+            std::get<1>(send_param).type);
   process()->sink().ClearMessages();
 }
 
@@ -1026,7 +1027,7 @@ TEST_F(CredentialManagerDispatcherTest, IncognitoZeroClickRequestCredential) {
   ASSERT_TRUE(message);
   CredentialManagerMsg_SendCredential::Param param;
   CredentialManagerMsg_SendCredential::Read(message, &param);
-  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, base::get<1>(param).type);
+  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, std::get<1>(param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
diff --git a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
index cb8c750..d7318d7 100644
--- a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
+++ b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include "components/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/content/renderer/credential_manager_client.h"
 #include "content/public/test/render_view_test.h"
@@ -56,23 +58,23 @@ class CredentialManagerClientTest : public content::RenderViewTest {
 
     switch (message_id) {
       case CredentialManagerHostMsg_Store::ID: {
-        base::Tuple<int, CredentialInfo> param;
+        std::tuple<int, CredentialInfo> param;
         CredentialManagerHostMsg_Store::Read(message, &param);
-        request_id = base::get<0>(param);
+        request_id = std::get<0>(param);
         break;
       }
 
       case CredentialManagerHostMsg_RequireUserMediation::ID: {
-        base::Tuple<int> param;
+        std::tuple<int> param;
         CredentialManagerHostMsg_RequireUserMediation::Read(message, &param);
-        request_id = base::get<0>(param);
+        request_id = std::get<0>(param);
         break;
       }
 
       case CredentialManagerHostMsg_RequestCredential::ID: {
-        base::Tuple<int, bool, bool, std::vector<GURL>> param;
+        std::tuple<int, bool, bool, std::vector<GURL>> param;
         CredentialManagerHostMsg_RequestCredential::Read(message, &param);
-        request_id = base::get<0>(param);
+        request_id = std::get<0>(param);
         break;
       }
 
diff --git a/components/printing/test/print_web_view_helper_browsertest.cc b/components/printing/test/print_web_view_helper_browsertest.cc
index 1e60197..8070e1a 100644
--- a/components/printing/test/print_web_view_helper_browsertest.cc
+++ b/components/printing/test/print_web_view_helper_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include <stddef.h>
 
+#include <tuple>
+
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ -180,7 +182,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
     PrintHostMsg_DidGetPrintedPagesCount::Param post_page_count_param;
     PrintHostMsg_DidGetPrintedPagesCount::Read(page_cnt_msg,
                                                &post_page_count_param);
-    EXPECT_EQ(count, base::get<1>(post_page_count_param));
+    EXPECT_EQ(count, std::get<1>(post_page_count_param));
 #endif  // defined(OS_CHROMEOS)
   }
 
@@ -196,7 +198,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
     PrintHostMsg_DidGetPreviewPageCount::Param post_page_count_param;
     PrintHostMsg_DidGetPreviewPageCount::Read(page_cnt_msg,
                                               &post_page_count_param);
-    EXPECT_EQ(count, base::get<0>(post_page_count_param).page_count);
+    EXPECT_EQ(count, std::get<0>(post_page_count_param).page_count);
   }
 #endif  // defined(ENABLE_PRINT_PREVIEW)
 
@@ -210,7 +212,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
     if (printed) {
       PrintHostMsg_DidPrintPage::Param post_did_print_page_param;
       PrintHostMsg_DidPrintPage::Read(print_msg, &post_did_print_page_param);
-      EXPECT_EQ(0, base::get<0>(post_did_print_page_param).page_number);
+      EXPECT_EQ(0, std::get<0>(post_did_print_page_param).page_number);
     }
   }
 
@@ -546,9 +548,9 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
     if (did_get_preview_msg) {
       PrintHostMsg_MetafileReadyForPrinting::Param preview_param;
       PrintHostMsg_MetafileReadyForPrinting::Read(preview_msg, &preview_param);
-      EXPECT_NE(0, base::get<0>(preview_param).document_cookie);
-      EXPECT_NE(0, base::get<0>(preview_param).expected_pages_count);
-      EXPECT_NE(0U, base::get<0>(preview_param).data_size);
+      EXPECT_NE(0, std::get<0>(preview_param).document_cookie);
+      EXPECT_NE(0, std::get<0>(preview_param).expected_pages_count);
+      EXPECT_NE(0U, std::get<0>(preview_param).data_size);
     }
   }
 
@@ -574,12 +576,12 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
       if (msg->type() == PrintHostMsg_DidPreviewPage::ID) {
         PrintHostMsg_DidPreviewPage::Param page_param;
         PrintHostMsg_DidPreviewPage::Read(msg, &page_param);
-        if (base::get<0>(page_param).page_number == page_number) {
+        if (std::get<0>(page_param).page_number == page_number) {
           msg_found = true;
           if (generate_draft_pages)
-            EXPECT_NE(0U, base::get<0>(page_param).data_size);
+            EXPECT_NE(0U, std::get<0>(page_param).data_size);
           else
-            EXPECT_EQ(0U, base::get<0>(page_param).data_size);
+            EXPECT_EQ(0U, std::get<0>(page_param).data_size);
           break;
         }
       }
@@ -602,13 +604,13 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
       PrintHostMsg_DidGetDefaultPageLayout::Param param;
       PrintHostMsg_DidGetDefaultPageLayout::Read(default_page_layout_msg,
                                                  &param);
-      EXPECT_EQ(content_width, base::get<0>(param).content_width);
-      EXPECT_EQ(content_height, base::get<0>(param).content_height);
-      EXPECT_EQ(margin_top, base::get<0>(param).margin_top);
-      EXPECT_EQ(margin_right, base::get<0>(param).margin_right);
-      EXPECT_EQ(margin_left, base::get<0>(param).margin_left);
-      EXPECT_EQ(margin_bottom, base::get<0>(param).margin_bottom);
-      EXPECT_EQ(page_has_print_css, base::get<2>(param));
+      EXPECT_EQ(content_width, std::get<0>(param).content_width);
+      EXPECT_EQ(content_height, std::get<0>(param).content_height);
+      EXPECT_EQ(margin_top, std::get<0>(param).margin_top);
+      EXPECT_EQ(margin_right, std::get<0>(param).margin_right);
+      EXPECT_EQ(margin_left, std::get<0>(param).margin_left);
+      EXPECT_EQ(margin_bottom, std::get<0>(param).margin_bottom);
+      EXPECT_EQ(page_has_print_css, std::get<2>(param));
     }
   }
 
diff --git a/components/tracing/child_trace_message_filter_browsertest.cc b/components/tracing/child_trace_message_filter_browsertest.cc
index 011b556..1dc08d5 100644
--- a/components/tracing/child_trace_message_filter_browsertest.cc
+++ b/components/tracing/child_trace_message_filter_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include <stdint.h>
 
+#include <tuple>
+
 #include "base/callback.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ -138,8 +140,8 @@ class ChildTracingTest : public content::RenderViewTest, public IPC::Listener {
     // Check that the |dump_guid| and the |success| fields are properly set.
     TracingHostMsg_ProcessMemoryDumpResponse::Param params;
     TracingHostMsg_ProcessMemoryDumpResponse::Read(msg, &params);
-    const uint64_t resp_guid = base::get<0>(params);
-    const bool resp_success = base::get<1>(params);
+    const uint64_t resp_guid = std::get<0>(params);
+    const bool resp_success = std::get<1>(params);
     EXPECT_EQ(dump_guid, resp_guid);
     EXPECT_TRUE(resp_success);
   }
@@ -153,7 +155,7 @@ class ChildTracingTest : public content::RenderViewTest, public IPC::Listener {
     EXPECT_NE(nullptr, msg);
     TracingHostMsg_GlobalMemoryDumpRequest::Param params;
     TracingHostMsg_GlobalMemoryDumpRequest::Read(msg, &params);
-    MemoryDumpRequestArgs args = base::get<0>(params);
+    MemoryDumpRequestArgs args = std::get<0>(params);
     EXPECT_NE(0U, args.dump_guid);
     return args;
   }