Add RetainedRef uses where needed.

content/child/fileapi/webfilesystem_impl.cc

Index: content/child/fileapi/webfilesystem_impl.cc
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 75b1ec0e7c502bcb1ca802e92bf7973325b22cfb..f98536a2c2766ac2e7f1c4cdb4df0172f7ae45ba 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -104,7 +104,7 @@ void CallDispatcherOnMainThread(
         FROM_HERE,
         base::Bind(&CallDispatcherOnMainThread<Method, Params>,
                    main_thread_task_runner, method, params,
-                   scoped_refptr<WaitableCallbackResults>()));
+                   base::RetainedRef<WaitableCallbackResults>(nullptr)));

[Nico, 2016/03/18 21:01:01]

ditto

     if (!waitable_results)
       return;
     waitable_results->WaitAndRun();
@@ -424,10 +424,10 @@ void WebFileSystemImpl::openFileSystem(
                 static_cast<storage::FileSystemType>(type),
                 base::Bind(&OpenFileSystemCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results),
+                           base::RetainedRef(waitable_results)),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -442,10 +442,10 @@ void WebFileSystemImpl::resolveURL(
       MakeTuple(GURL(filesystem_url),
                 base::Bind(&ResolveURLCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results),
+                           base::RetainedRef(waitable_results)),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -462,7 +462,7 @@ void WebFileSystemImpl::deleteFileSystem(
                 static_cast<storage::FileSystemType>(type),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -478,7 +478,7 @@ void WebFileSystemImpl::move(
       MakeTuple(GURL(src_path), GURL(dest_path),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -494,7 +494,7 @@ void WebFileSystemImpl::copy(
       MakeTuple(GURL(src_path), GURL(dest_path),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -509,7 +509,7 @@ void WebFileSystemImpl::remove(
       MakeTuple(GURL(path), false /* recursive */,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -524,7 +524,7 @@ void WebFileSystemImpl::removeRecursively(
       MakeTuple(GURL(path), true /* recursive */,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -536,12 +536,13 @@ 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, waitable_results),
+      MakeTuple(GURL(path),
+                base::Bind(&ReadMetadataCallbackAdapter,
+                           base::ThreadTaskRunnerHandle::Get(), callbacks_id,
+                           base::RetainedRef(waitable_results)),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -557,7 +558,7 @@ void WebFileSystemImpl::createFile(
       MakeTuple(GURL(path), exclusive,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -573,7 +574,7 @@ void WebFileSystemImpl::createDirectory(
       MakeTuple(GURL(path), exclusive, false /* recursive */,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -588,7 +589,7 @@ void WebFileSystemImpl::fileExists(
       MakeTuple(GURL(path), false /* directory */,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -603,7 +604,7 @@ void WebFileSystemImpl::directoryExists(
       MakeTuple(GURL(path), true /* directory */,
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -615,12 +616,13 @@ 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, waitable_results),
+      MakeTuple(GURL(path),
+                base::Bind(&ReadDirectoryCallbackAdapter,
+                           base::ThreadTaskRunnerHandle::Get(), callbacks_id,
+                           base::RetainedRef(waitable_results)),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
   return callbacks_id;
 }
@@ -637,11 +639,11 @@ void WebFileSystemImpl::createFileWriter(
       MakeTuple(GURL(path),
                 base::Bind(&CreateFileWriterCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results, main_thread_task_runner_,
-                           GURL(path), client),
+                           base::RetainedRef(waitable_results),
+                           main_thread_task_runner_, GURL(path), client),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }
 
@@ -656,10 +658,11 @@ void WebFileSystemImpl::createSnapshotFileAndReadMetadata(
       MakeTuple(GURL(path),
                 base::Bind(&CreateSnapshotFileCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results, main_thread_task_runner_),
+                           base::RetainedRef(waitable_results),
+                           main_thread_task_runner_),
                 base::Bind(&StatusCallbackAdapter,
                            base::ThreadTaskRunnerHandle::Get(), callbacks_id,
-                           waitable_results)),
+                           base::RetainedRef(waitable_results))),
       waitable_results.get());
 }