Index: content/child/fileapi/webfilesystem_impl.cc |
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc |
index 848079f09ae63d4f5730b3ba3c42f757b2bb17bb..40db70ce55ee439d8ea7b5edaa23be743f4956e3 100644 |
--- a/content/child/fileapi/webfilesystem_impl.cc |
+++ b/content/child/fileapi/webfilesystem_impl.cc |
@@ -5,6 +5,7 @@ |
#include "content/child/fileapi/webfilesystem_impl.h" |
#include <stddef.h> |
+#include <tuple> |
#include "base/bind.h" |
#include "base/lazy_instance.h" |
@@ -28,7 +29,6 @@ |
#include "third_party/WebKit/public/web/WebHeap.h" |
#include "url/gurl.h" |
-using base::MakeTuple; |
using blink::WebFileInfo; |
using blink::WebFileSystemCallbacks; |
using blink::WebFileSystemEntry; |
@@ -419,14 +419,14 @@ void WebFileSystemImpl::openFileSystem( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::OpenFileSystem, |
- MakeTuple(GURL(storage_partition), |
- static_cast<storage::FileSystemType>(type), |
- base::Bind(&OpenFileSystemCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results)), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(storage_partition), static_cast<storage::FileSystemType>(type), |
+ base::Bind(&OpenFileSystemCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results)), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -438,13 +438,14 @@ void WebFileSystemImpl::resolveURL( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::ResolveURL, |
- MakeTuple(GURL(filesystem_url), |
- base::Bind(&ResolveURLCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results)), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(filesystem_url), |
+ base::Bind(&ResolveURLCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results)), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -457,11 +458,11 @@ void WebFileSystemImpl::deleteFileSystem( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::DeleteFileSystem, |
- MakeTuple(GURL(storage_partition), |
- static_cast<storage::FileSystemType>(type), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(storage_partition), static_cast<storage::FileSystemType>(type), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -474,10 +475,11 @@ void WebFileSystemImpl::move( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Move, |
- MakeTuple(GURL(src_path), GURL(dest_path), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(src_path), GURL(dest_path), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -490,10 +492,11 @@ void WebFileSystemImpl::copy( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Copy, |
- MakeTuple(GURL(src_path), GURL(dest_path), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(src_path), GURL(dest_path), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -505,10 +508,11 @@ void WebFileSystemImpl::remove( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Remove, |
- MakeTuple(GURL(path), false /* recursive */, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), false /* recursive */, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -520,10 +524,11 @@ void WebFileSystemImpl::removeRecursively( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Remove, |
- MakeTuple(GURL(path), true /* recursive */, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), true /* recursive */, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -535,13 +540,14 @@ void WebFileSystemImpl::readMetadata( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::ReadMetadata, |
- MakeTuple(GURL(path), |
- base::Bind(&ReadMetadataCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results)), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), |
+ base::Bind(&ReadMetadataCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results)), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -554,10 +560,11 @@ void WebFileSystemImpl::createFile( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::CreateFile, |
- MakeTuple(GURL(path), exclusive, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), exclusive, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -570,10 +577,11 @@ void WebFileSystemImpl::createDirectory( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::CreateDirectory, |
- MakeTuple(GURL(path), exclusive, false /* recursive */, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), exclusive, false /* recursive */, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -585,10 +593,11 @@ void WebFileSystemImpl::fileExists( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Exists, |
- MakeTuple(GURL(path), false /* directory */, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), false /* directory */, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -600,10 +609,11 @@ void WebFileSystemImpl::directoryExists( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::Exists, |
- MakeTuple(GURL(path), true /* directory */, |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), true /* directory */, |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -615,13 +625,14 @@ int WebFileSystemImpl::readDirectory( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::ReadDirectory, |
- MakeTuple(GURL(path), |
- base::Bind(&ReadDirectoryCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results)), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), |
+ base::Bind(&ReadDirectoryCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results)), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
return callbacks_id; |
} |
@@ -635,14 +646,15 @@ void WebFileSystemImpl::createFileWriter( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::ReadMetadata, |
- MakeTuple(GURL(path), |
- base::Bind(&CreateFileWriterCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results), |
- main_thread_task_runner_, GURL(path), client), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), |
+ base::Bind(&CreateFileWriterCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results), |
+ main_thread_task_runner_, GURL(path), client), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |
@@ -654,14 +666,15 @@ void WebFileSystemImpl::createSnapshotFileAndReadMetadata( |
MaybeCreateWaitableResults(callbacks, callbacks_id); |
CallDispatcherOnMainThread( |
main_thread_task_runner_, &FileSystemDispatcher::CreateSnapshotFile, |
- MakeTuple(GURL(path), |
- base::Bind(&CreateSnapshotFileCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results), |
- main_thread_task_runner_), |
- base::Bind(&StatusCallbackAdapter, |
- base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
- base::RetainedRef(waitable_results))), |
+ std::make_tuple( |
+ GURL(path), |
+ base::Bind(&CreateSnapshotFileCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results), |
+ main_thread_task_runner_), |
+ base::Bind(&StatusCallbackAdapter, |
+ base::ThreadTaskRunnerHandle::Get(), callbacks_id, |
+ base::RetainedRef(waitable_results))), |
waitable_results.get()); |
} |