Remove base::Tuple

content/browser/blob_storage/blob_dispatcher_host_unittest.cc

 // Copyright 2016 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/browser/blob_storage/blob_dispatcher_host.h"
 
 #include <memory>
+#include <tuple>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/shared_memory.h"
 #include "base/run_loop.h"
-#include "base/tuple.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/common/fileapi/webblob_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_test_sink.h"
 #include "ipc/message_filter.h"
 #include "storage/browser/blob/blob_data_builder.h"
 #include "storage/browser/blob/blob_data_handle.h"
@@ skipping 154 matching lines @@
   void ExpectRequest(
       const std::string& expected_uuid,
       const std::vector<BlobItemBytesRequest>& expected_requests) {
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_DoneBuildingBlob::ID));
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_CancelBuildingBlob::ID));
     const IPC::Message* message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_RequestMemoryItem::ID);
     ASSERT_TRUE(message);
-    base::Tuple<std::string, std::vector<storage::BlobItemBytesRequest>,
-                std::vector<base::SharedMemoryHandle>,
-                std::vector<IPC::PlatformFileForTransit>>
+    std::tuple<std::string, std::vector<storage::BlobItemBytesRequest>,
+               std::vector<base::SharedMemoryHandle>,
+               std::vector<IPC::PlatformFileForTransit>>
         args;
     BlobStorageMsg_RequestMemoryItem::Read(message, &args);
-    EXPECT_EQ(expected_uuid, base::get<0>(args));
-    std::vector<BlobItemBytesRequest> requests = base::get<1>(args);
+    EXPECT_EQ(expected_uuid, std::get<0>(args));
+    std::vector<BlobItemBytesRequest> requests = std::get<1>(args);
     ASSERT_EQ(requests.size(), expected_requests.size());
     for (size_t i = 0; i < expected_requests.size(); ++i) {
       EXPECT_EQ(expected_requests[i], requests[i]);
     }
   }
 
   void ExpectRequestWithSharedMemoryHandles(
       const std::string& expected_uuid,
       const std::vector<BlobItemBytesRequest>& expected_requests,
       std::vector<base::SharedMemoryHandle>* shared_memory_handles) {
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_DoneBuildingBlob::ID));
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_CancelBuildingBlob::ID));
     const IPC::Message* message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_RequestMemoryItem::ID);
     ASSERT_TRUE(message);
-    base::Tuple<std::string, std::vector<storage::BlobItemBytesRequest>,
-                std::vector<base::SharedMemoryHandle>,
-                std::vector<IPC::PlatformFileForTransit>>
+    std::tuple<std::string, std::vector<storage::BlobItemBytesRequest>,
+               std::vector<base::SharedMemoryHandle>,
+               std::vector<IPC::PlatformFileForTransit>>
         args;
     BlobStorageMsg_RequestMemoryItem::Read(message, &args);
-    EXPECT_EQ(expected_uuid, base::get<0>(args));
-    std::vector<BlobItemBytesRequest> requests = base::get<1>(args);
+    EXPECT_EQ(expected_uuid, std::get<0>(args));
+    std::vector<BlobItemBytesRequest> requests = std::get<1>(args);
     ASSERT_EQ(requests.size(), expected_requests.size());
     for (size_t i = 0; i < expected_requests.size(); ++i) {
       EXPECT_EQ(expected_requests[i], requests[i]);
     }
-    *shared_memory_handles = std::move(base::get<2>(args));
+    *shared_memory_handles = std::move(std::get<2>(args));
   }
 
   void ExpectCancel(const std::string& expected_uuid,
                     IPCBlobCreationCancelCode code) {
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_RequestMemoryItem::ID));
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_DoneBuildingBlob::ID));
     const IPC::Message* message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_CancelBuildingBlob::ID);
     ASSERT_TRUE(message);
-    base::Tuple<std::string, IPCBlobCreationCancelCode> args;
+    std::tuple<std::string, IPCBlobCreationCancelCode> args;
     BlobStorageMsg_CancelBuildingBlob::Read(message, &args);
-    EXPECT_EQ(expected_uuid, base::get<0>(args));
-    EXPECT_EQ(code, base::get<1>(args));
+    EXPECT_EQ(expected_uuid, std::get<0>(args));
+    EXPECT_EQ(code, std::get<1>(args));
   }
 
   void ExpectDone(const std::string& expected_uuid) {
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_RequestMemoryItem::ID));
     EXPECT_FALSE(
         sink_.GetFirstMessageMatching(BlobStorageMsg_CancelBuildingBlob::ID));
     const IPC::Message* message =
         sink_.GetUniqueMessageMatching(BlobStorageMsg_DoneBuildingBlob::ID);
-    base::Tuple<std::string> args;
+    std::tuple<std::string> args;
     BlobStorageMsg_DoneBuildingBlob::Read(message, &args);
-    EXPECT_EQ(expected_uuid, base::get<0>(args));
+    EXPECT_EQ(expected_uuid, std::get<0>(args));
   }
 
   bool IsBeingBuiltInHost(const std::string& uuid) {
     return host_->async_builder_.IsBeingBuilt(uuid);
   }
 
   IPC::TestSink sink_;
   TestBrowserThreadBundle browser_thread_bundle_;
   TestBrowserContext browser_context_;
   ChromeBlobStorageContext* chrome_blob_storage_context_;
@@ skipping 931 matching lines @@
   EXPECT_EQ(IPCBlobCreationCancelCode::SOURCE_DIED_IN_TRANSIT,
             same_host_error_code);
   EXPECT_FALSE(other_host_built);
   EXPECT_EQ(IPCBlobCreationCancelCode::SOURCE_DIED_IN_TRANSIT,
             other_host_error_code);
 
   sink_.ClearMessages();
 }
 
 }  // namespace content