Remove base::Tuple

content/child/blob_storage/blob_transport_controller_unittest.cc

 // Copyright 2015 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 "content/child/blob_storage/blob_transport_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
+#include <tuple>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/tuple.h"
 #include "content/child/blob_storage/blob_consolidation.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/fileapi/webblob_messages.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_platform_file.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "ipc/ipc_test_sink.h"
 #include "storage/common/blob_storage/blob_item_bytes_request.h"
 #include "storage/common/blob_storage/blob_item_bytes_response.h"
@@ skipping 95 matching lines @@
 
   void ExpectRegisterAndStartMessage(const std::string& expected_uuid,
                                      const std::string& expected_content_type,
                                      std::vector<DataElement>* descriptions) {
     const IPC::Message* register_message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_RegisterBlobUUID::ID);
     const IPC::Message* start_message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_StartBuildingBlob::ID);
     ASSERT_TRUE(register_message);
     ASSERT_TRUE(start_message);
-    base::Tuple<std::string, std::string, std::string, std::set<std::string>>
+    std::tuple<std::string, std::string, std::string, std::set<std::string>>
         register_contents;
-    base::Tuple<std::string, std::vector<DataElement>> start_contents;
+    std::tuple<std::string, std::vector<DataElement>> start_contents;
     BlobStorageMsg_RegisterBlobUUID::Read(register_message, &register_contents);
     BlobStorageMsg_StartBuildingBlob::Read(start_message, &start_contents);
-    EXPECT_EQ(expected_uuid, base::get<0>(register_contents));
-    EXPECT_EQ(expected_uuid, base::get<0>(start_contents));
-    EXPECT_EQ(expected_content_type, base::get<1>(register_contents));
+    EXPECT_EQ(expected_uuid, std::get<0>(register_contents));
+    EXPECT_EQ(expected_uuid, std::get<0>(start_contents));
+    EXPECT_EQ(expected_content_type, std::get<1>(register_contents));
     if (descriptions)
-      *descriptions = base::get<1>(start_contents);
+      *descriptions = std::get<1>(start_contents);
     // We don't have dispositions from the renderer.
-    EXPECT_TRUE(base::get<2>(register_contents).empty());
+    EXPECT_TRUE(std::get<2>(register_contents).empty());
     sink_.ClearMessages();
   }
 
   void ExpectMemoryResponses(
       const std::string& expected_uuid,
       std::vector<storage::BlobItemBytesResponse> expected_responses) {
     const IPC::Message* responses_message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_MemoryItemResponse::ID);
     ASSERT_TRUE(responses_message);
-    base::Tuple<std::string, std::vector<storage::BlobItemBytesResponse>>
+    std::tuple<std::string, std::vector<storage::BlobItemBytesResponse>>
         responses_content;
     BlobStorageMsg_MemoryItemResponse::Read(responses_message,
                                             &responses_content);
-    EXPECT_EQ(expected_uuid, base::get<0>(responses_content));
-    EXPECT_EQ(expected_responses, base::get<1>(responses_content));
+    EXPECT_EQ(expected_uuid, std::get<0>(responses_content));
+    EXPECT_EQ(expected_responses, std::get<1>(responses_content));
     sink_.ClearMessages();
   }
 
   void ExpectCancel(const std::string& expected_uuid,
                     storage::IPCBlobCreationCancelCode expected_code) {
     const IPC::Message* cancel_message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_CancelBuildingBlob::ID);
     ASSERT_TRUE(cancel_message);
-    base::Tuple<std::string, storage::IPCBlobCreationCancelCode> cancel_content;
+    std::tuple<std::string, storage::IPCBlobCreationCancelCode> cancel_content;
     BlobStorageMsg_CancelBuildingBlob::Read(cancel_message, &cancel_content);
-    EXPECT_EQ(expected_uuid, base::get<0>(cancel_content));
-    EXPECT_EQ(expected_code, base::get<1>(cancel_content));
+    EXPECT_EQ(expected_uuid, std::get<0>(cancel_content));
+    EXPECT_EQ(expected_code, std::get<1>(cancel_content));
   }
 
   void TearDown() override {
     BlobTransportController::GetInstance()->CancelAllBlobTransfers();
     for (const FilePath& path : files_opened_) {
       EXPECT_TRUE(base::DeleteFile(path, false));
     }
     EXPECT_FALSE(io_thread_runner_->HasPendingTask());
     EXPECT_FALSE(file_thread_runner_->HasPendingTask());
     EXPECT_FALSE(main_thread_runner_->HasPendingTask());
@@ skipping 225 matching lines @@
   EXPECT_TRUE(io_thread_runner_->HasPendingTask());
   // Check that we've sent the data.
   ExpectRegisterAndStartMessage(kBlobUUID, kBlobContentType,
                                 &message_descriptions);
   main_thread_runner_->ClearPendingTasks();
 
   // Check that we got the correct start message.
   EXPECT_FALSE(holder->IsTransporting(kBlobUUID));
   io_thread_runner_->RunPendingTasks();
   EXPECT_TRUE(holder->IsTransporting(kBlobUUID));
-  base::Tuple<std::string, std::vector<DataElement>> message_contents;
+  std::tuple<std::string, std::vector<DataElement>> message_contents;
   EXPECT_TRUE(holder->IsTransporting(kBlobUUID));
   EXPECT_EQ(MakeBlobElement(KRefBlobUUID, 10, 10), message_descriptions[0]);
 
   holder->OnCancel(kBlobUUID, IPCBlobCreationCancelCode::OUT_OF_MEMORY);
   EXPECT_FALSE(holder->IsTransporting(kBlobUUID));
   // Check we have the 'decrease ref' task.
   EXPECT_TRUE(main_thread_runner_->HasPendingTask());
   main_thread_runner_->ClearPendingTasks();
   sink_.ClearMessages();
 
@@ skipping 42 matching lines @@
   EXPECT_FALSE(main_thread_runner_->HasPendingTask());
 
   // Finish the second one.
   holder->OnDone(kBlob2UUID);
   EXPECT_FALSE(holder->IsTransporting(kBlob2UUID));
   EXPECT_TRUE(main_thread_runner_->HasPendingTask());
   main_thread_runner_->ClearPendingTasks();
 }
 
 }  // namespace content