Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6277)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc

Issue 16413007: Make FileSystemOperation NOT self-destruct (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browser_tests Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media_galleries/fileapi/device_media_async_file_util.h ('k') | chrome/browser/media_galleries/fileapi/native_media_file_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
diff --git a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
index 6970b151e28ff9abbed0771d1e118574d3d64792..cf1f3be3b4790871cc46274713df5ead01b5aaa4 100644
--- a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
@@ -82,11 +82,11 @@ DeviceMediaAsyncFileUtil* DeviceMediaAsyncFileUtil::Create(
}
bool DeviceMediaAsyncFileUtil::CreateOrOpen(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
int file_flags,
const CreateOrOpenCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null()) {
base::PlatformFile invalid_file = base::kInvalidPlatformFileValue;
@@ -98,10 +98,10 @@ bool DeviceMediaAsyncFileUtil::CreateOrOpen(
}
bool DeviceMediaAsyncFileUtil::EnsureFileExists(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const EnsureFileExistsCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY, false);
@@ -109,12 +109,12 @@ bool DeviceMediaAsyncFileUtil::EnsureFileExists(
}
bool DeviceMediaAsyncFileUtil::CreateDirectory(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
bool exclusive,
bool recursive,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -122,11 +122,11 @@ bool DeviceMediaAsyncFileUtil::CreateDirectory(
}
bool DeviceMediaAsyncFileUtil::GetFileInfo(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const GetFileInfoCallback& callback) {
- DCHECK(IsOnIOThread(context));
- MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context);
+ DCHECK(IsOnIOThread(context.get()));
+ MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context.get());
if (!delegate) {
OnGetFileInfoError(callback, url.path(),
base::PLATFORM_FILE_ERROR_NOT_FOUND);
@@ -146,11 +146,11 @@ bool DeviceMediaAsyncFileUtil::GetFileInfo(
}
bool DeviceMediaAsyncFileUtil::ReadDirectory(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const ReadDirectoryCallback& callback) {
- DCHECK(IsOnIOThread(context));
- MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context);
+ DCHECK(IsOnIOThread(context.get()));
+ MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context.get());
if (!delegate) {
OnReadDirectoryError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
return true;
@@ -167,12 +167,12 @@ bool DeviceMediaAsyncFileUtil::ReadDirectory(
}
bool DeviceMediaAsyncFileUtil::Touch(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const base::Time& last_access_time,
const base::Time& last_modified_time,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -180,11 +180,11 @@ bool DeviceMediaAsyncFileUtil::Touch(
}
bool DeviceMediaAsyncFileUtil::Truncate(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
int64 length,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -192,11 +192,11 @@ bool DeviceMediaAsyncFileUtil::Truncate(
}
bool DeviceMediaAsyncFileUtil::CopyFileLocal(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& src_url,
const FileSystemURL& dest_url,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -204,11 +204,11 @@ bool DeviceMediaAsyncFileUtil::CopyFileLocal(
}
bool DeviceMediaAsyncFileUtil::MoveFileLocal(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& src_url,
const FileSystemURL& dest_url,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -216,11 +216,11 @@ bool DeviceMediaAsyncFileUtil::MoveFileLocal(
}
bool DeviceMediaAsyncFileUtil::CopyInForeignFile(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const base::FilePath& src_file_path,
const FileSystemURL& dest_url,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -228,10 +228,10 @@ bool DeviceMediaAsyncFileUtil::CopyInForeignFile(
}
bool DeviceMediaAsyncFileUtil::DeleteFile(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -239,10 +239,10 @@ bool DeviceMediaAsyncFileUtil::DeleteFile(
}
bool DeviceMediaAsyncFileUtil::DeleteDirectory(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const StatusCallback& callback) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
NOTIMPLEMENTED();
if (!callback.is_null())
callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
@@ -250,17 +250,18 @@ bool DeviceMediaAsyncFileUtil::DeleteDirectory(
}
bool DeviceMediaAsyncFileUtil::CreateSnapshotFile(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const FileSystemURL& url,
const CreateSnapshotFileCallback& callback) {
- DCHECK(IsOnIOThread(context));
- MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context);
+ DCHECK(IsOnIOThread(context.get()));
+ MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context.get());
if (!delegate) {
OnCreateSnapshotFileError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
return true;
}
base::FilePath* snapshot_file_path = new base::FilePath;
- return context->task_runner()->PostTaskAndReply(
+ base::SequencedTaskRunner* task_runner = context->task_runner();
+ return task_runner->PostTaskAndReply(
FROM_HERE,
base::Bind(&CreateSnapshotFileOnBlockingPool,
url.path(),
@@ -268,7 +269,7 @@ bool DeviceMediaAsyncFileUtil::CreateSnapshotFile(
base::Unretained(snapshot_file_path)),
base::Bind(&DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask,
weak_ptr_factory_.GetWeakPtr(),
- context,
+ base::Passed(&context),
callback,
url.path(),
base::Owned(snapshot_file_path)));
@@ -354,16 +355,16 @@ void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
}
void DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask(
- FileSystemOperationContext* context,
+ scoped_ptr<FileSystemOperationContext> context,
const AsyncFileUtil::CreateSnapshotFileCallback& callback,
const base::FilePath& device_file_path,
base::FilePath* snapshot_file_path) {
- DCHECK(IsOnIOThread(context));
+ DCHECK(IsOnIOThread(context.get()));
if (!snapshot_file_path || snapshot_file_path->empty()) {
OnCreateSnapshotFileError(callback, base::PLATFORM_FILE_ERROR_FAILED);
return;
}
- MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context);
+ MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(context.get());
if (!delegate) {
OnCreateSnapshotFileError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
return;
« no previous file with comments | « chrome/browser/media_galleries/fileapi/device_media_async_file_util.h ('k') | chrome/browser/media_galleries/fileapi/native_media_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698