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

storage/browser/fileapi/obfuscated_file_util.cc

 // Copyright (c) 2012 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 "storage/browser/fileapi/obfuscated_file_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
+#include <tuple>
 
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 63 matching lines @@
   if (growth > 0 && new_quota < 0)
     return false;
   context->set_allowed_bytes_growth(new_quota);
   return true;
 }
 
 void UpdateUsage(FileSystemOperationContext* context,
                  const FileSystemURL& url,
                  int64_t growth) {
   context->update_observers()->Notify(
-      &FileUpdateObserver::OnUpdate, base::MakeTuple(url, growth));
+      &FileUpdateObserver::OnUpdate, std::make_tuple(url, growth));
 }
 
 void TouchDirectory(SandboxDirectoryDatabase* db, FileId dir_id) {
   DCHECK(db);
   if (!db->UpdateModificationTime(dir_id, base::Time::Now()))
     NOTREACHED();
 }
 
 enum IsolatedOriginStatus {
   kIsolatedOriginMatch,
@@ skipping 210 matching lines @@
 
   int64_t growth = UsageForPath(file_info.name.size());
   if (!AllocateQuota(context, growth))
     return base::File::FILE_ERROR_NO_SPACE;
   base::File::Error error = CreateFile(context, base::FilePath(), url,
                                        &file_info);
   if (created && base::File::FILE_OK == error) {
     *created = true;
     UpdateUsage(context, url, growth);
     context->change_observers()->Notify(
-        &FileChangeObserver::OnCreateFile, base::MakeTuple(url));
+        &FileChangeObserver::OnCreateFile, std::make_tuple(url));
   }
   return error;
 }
 
 base::File::Error ObfuscatedFileUtil::CreateDirectory(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     bool exclusive,
     bool recursive) {
   SandboxDirectoryDatabase* db = GetDirectoryDatabase(url, true);
@@ skipping 38 matching lines @@
     file_info.modification_time = base::Time::Now();
     file_info.parent_id = parent_id;
     int64_t growth = UsageForPath(file_info.name.size());
     if (!AllocateQuota(context, growth))
       return base::File::FILE_ERROR_NO_SPACE;
     base::File::Error error = db->AddFileInfo(file_info, &parent_id);
     if (error != base::File::FILE_OK)
       return error;
     UpdateUsage(context, url, growth);
     context->change_observers()->Notify(
-        &FileChangeObserver::OnCreateDirectory, base::MakeTuple(url));
+        &FileChangeObserver::OnCreateDirectory, std::make_tuple(url));
     if (first) {
       first = false;
       TouchDirectory(db, file_info.parent_id);
     }
   }
   return base::File::FILE_OK;
 }
 
 base::File::Error ObfuscatedFileUtil::GetFileInfo(
     FileSystemOperationContext* context,
@@ skipping 80 matching lines @@
   if (error != base::File::FILE_OK)
     return error;
 
   int64_t growth = length - file_info.size;
   if (!AllocateQuota(context, growth))
     return base::File::FILE_ERROR_NO_SPACE;
   error = NativeFileUtil::Truncate(local_path, length);
   if (error == base::File::FILE_OK) {
     UpdateUsage(context, url, growth);
     context->change_observers()->Notify(
-        &FileChangeObserver::OnModifyFile, base::MakeTuple(url));
+        &FileChangeObserver::OnModifyFile, std::make_tuple(url));
   }
   return error;
 }
 
 base::File::Error ObfuscatedFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* context,
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     CopyOrMoveOption option,
     bool copy) {
@@ skipping 106 matching lines @@
         error = base::File::FILE_ERROR_FAILED;
     }
   }
 
   if (error != base::File::FILE_OK)
     return error;
 
   if (overwrite) {
     context->change_observers()->Notify(
         &FileChangeObserver::OnModifyFile,
-        base::MakeTuple(dest_url));
+        std::make_tuple(dest_url));
   } else {
     context->change_observers()->Notify(
         &FileChangeObserver::OnCreateFileFrom,
-        base::MakeTuple(dest_url, src_url));
+        std::make_tuple(dest_url, src_url));
   }
 
   if (!copy) {
     context->change_observers()->Notify(
-        &FileChangeObserver::OnRemoveFile, base::MakeTuple(src_url));
+        &FileChangeObserver::OnRemoveFile, std::make_tuple(src_url));
     TouchDirectory(db, src_file_info.parent_id);
   }
 
   TouchDirectory(db, dest_file_info.parent_id);
 
   UpdateUsage(context, dest_url, growth);
   return error;
 }
 
 base::File::Error ObfuscatedFileUtil::CopyInForeignFile(
@@ skipping 58 matching lines @@
                                                               true /* copy */));
   } else {
     error = CreateFile(context, src_file_path, dest_url, &dest_file_info);
   }
 
   if (error != base::File::FILE_OK)
     return error;
 
   if (overwrite) {
     context->change_observers()->Notify(
-        &FileChangeObserver::OnModifyFile, base::MakeTuple(dest_url));
+        &FileChangeObserver::OnModifyFile, std::make_tuple(dest_url));
   } else {
     context->change_observers()->Notify(
-        &FileChangeObserver::OnCreateFile, base::MakeTuple(dest_url));
+        &FileChangeObserver::OnCreateFile, std::make_tuple(dest_url));
   }
 
   UpdateUsage(context, dest_url, growth);
   TouchDirectory(db, dest_file_info.parent_id);
   return base::File::FILE_OK;
 }
 
 base::File::Error ObfuscatedFileUtil::DeleteFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
@@ skipping 20 matching lines @@
       -UsageForPath(file_info.name.size()) - platform_file_info.size;
   AllocateQuota(context, growth);
   if (!db->RemoveFileInfo(file_id)) {
     NOTREACHED();
     return base::File::FILE_ERROR_FAILED;
   }
   UpdateUsage(context, url, growth);
   TouchDirectory(db, file_info.parent_id);
 
   context->change_observers()->Notify(
-      &FileChangeObserver::OnRemoveFile, base::MakeTuple(url));
+      &FileChangeObserver::OnRemoveFile, std::make_tuple(url));
 
   if (error == base::File::FILE_ERROR_NOT_FOUND)
     return base::File::FILE_OK;
 
   error = NativeFileUtil::DeleteFile(local_path);
   if (base::File::FILE_OK != error)
     LOG(WARNING) << "Leaked a backing file.";
   return base::File::FILE_OK;
 }
 
@@ skipping 14 matching lines @@
   }
   if (!file_info.is_directory())
     return base::File::FILE_ERROR_NOT_A_DIRECTORY;
   if (!db->RemoveFileInfo(file_id))
     return base::File::FILE_ERROR_NOT_EMPTY;
   int64_t growth = -UsageForPath(file_info.name.size());
   AllocateQuota(context, growth);
   UpdateUsage(context, url, growth);
   TouchDirectory(db, file_info.parent_id);
   context->change_observers()->Notify(
-      &FileChangeObserver::OnRemoveDirectory, base::MakeTuple(url));
+      &FileChangeObserver::OnRemoveDirectory, std::make_tuple(url));
   return base::File::FILE_OK;
 }
 
 storage::ScopedFile ObfuscatedFileUtil::CreateSnapshotFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     base::File::Error* error,
     base::File::Info* file_info,
     base::FilePath* platform_path) {
   // We're just returning the local file information.
@@ skipping 575 matching lines @@
     InitFileInfo(&file_info, parent_id,
                  VirtualPath::BaseName(url.path()).value());
 
     int64_t growth = UsageForPath(file_info.name.size());
     if (!AllocateQuota(context, growth))
       return base::File(base::File::FILE_ERROR_NO_SPACE);
     base::File file = CreateAndOpenFile(context, url, &file_info, file_flags);
     if (file.IsValid()) {
       UpdateUsage(context, url, growth);
       context->change_observers()->Notify(
-          &FileChangeObserver::OnCreateFile, base::MakeTuple(url));
+          &FileChangeObserver::OnCreateFile, std::make_tuple(url));
     }
     return file;
   }
 
   if (file_flags & base::File::FLAG_CREATE)
     return base::File(base::File::FILE_ERROR_EXISTS);
 
   base::File::Info platform_file_info;
   base::FilePath local_path;
   FileInfo file_info;
@@ skipping 22 matching lines @@
       LOG(WARNING) << "Lost a backing file.";
       return base::File(base::File::FILE_ERROR_FAILED);
     }
     return file;
   }
 
   // If truncating we need to update the usage.
   if (delta) {
     UpdateUsage(context, url, delta);
     context->change_observers()->Notify(
-        &FileChangeObserver::OnModifyFile, base::MakeTuple(url));
+        &FileChangeObserver::OnModifyFile, std::make_tuple(url));
   }
   return file;
 }
 
 bool ObfuscatedFileUtil::HasIsolatedStorage(const GURL& origin) {
   return special_storage_policy_.get() &&
       special_storage_policy_->HasIsolatedStorage(origin);
 }
 
 }  // namespace storage