Convert Media Galleries to use base::File

Convert Media Galleries to use base::File

Unfortunately, this brings in changes to webkit/browser/fileapi, and once
that changes, a lot of files have to be updated.

The bright side is that most of the collateral changes are just trivial
renaming of PlatformFileError -> File::Error and PlatformFileInfo ->
File::Info

BUG=322664
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247301

[rvargas (doing something else), 2014-01-22 23:05:58]

Forgive me for the large review :(

Most changes outside of media galleries should be a trivial rename.

reviewers:

thestig@chromium.org:
  Media galleries
  browser/storage_monitor

kinuko@chromium.org:
  chrome/browser/sync_file_system
  content/browser/fileapi
  content/child/fileapi
  webkit

willchan@chromium.org:
  base
  net

derat@chromium.org: browser/chromeos

pfeldman@chromium.org: browser/devtools

scheib@chromium.org: browser/extensions

gene@chromium.org: browser/local_discovery

jvoung@chromium.org: components/nacl

sky@chromium.org: content/browser/loader

dmichael@chromium.org:
  content/browser/renderer_host/pepper
  ppapi

jamesr@chromium.org: content/renderer

jam@chromium.org:
  content/browser/renderer_host/file_utilities_message_filter
  content/common
  content/public
  content/worker
  ipc

[rvargas (doing something else), 2014-01-22 23:10:03]

Now with the reviewers.

[Lei Zhang, 2014-01-22 23:16:58]

I looked through a bunch of the chrome/ changes and it all looks fairly straight
forward. chrome/ lgtm

The file list isn't sorted. Boooooo.

[Daniel Erat, 2014-01-22 23:19:17]

yes, rietveld has outdone itself here.

rubberstamp lgtm for c/b/chromeos, but someone who works on drive ought to be
looking at this instead of me. adding satorux@

[jamesr, 2014-01-22 23:32:44]

kinuko's a better reviewer for the webkit/ changes, removing myself

[sky, 2014-01-23 01:09:18]

content/browser/loader LGTM

[jvoung (off chromium), 2014-01-23 01:33:28]

components/nacl LGTM

[jam, 2014-01-23 01:54:51]

lgtm

[kinuko, 2014-01-23 02:07:17]

webkit/ lgtm

[satorux1, 2014-01-23 03:47:12]

kinaba@ for c/b/chromeos/drive

[kinaba, 2014-01-23 06:10:03]

lgtm with a nit

https://codereview.chromium.org/145303002/diff/1/chrome/browser/chromeos/driv...
File chrome/browser/chromeos/drive/fileapi_worker.cc (right):

https://codereview.chromium.org/145303002/diff/1/chrome/browser/chromeos/driv...
chrome/browser/chromeos/drive/fileapi_worker.cc:186: base::PlatformFileError*
result =
What about declaring this variable as base::File::Error and cast as the argument
of base::CreatePlatformFile, rather than doing so for RunOpenFileCallback?

I understand this is transient and may probably be safe, but still I'm anxious
about deleting reinterpret_cast<>ed pointer in base::Owned.

[dmichael (off chromium), 2014-01-23 16:33:43]

Is there a way you can do this without reinterpret_cast? If you reinterpret_cast
in order to use a variable as a different type than it actually is, that causes
undefined behavior.

https://codereview.chromium.org/145303002/diff/1/content/browser/renderer_hos...
File content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
(right):

https://codereview.chromium.org/145303002/diff/1/content/browser/renderer_hos...
content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc:130:
reinterpret_cast<base::PlatformFileError*>(&error));
This looks pretty sketchy to me. If you can't go 100% to base::File, then
|error| should probably still be a base::PlatformFileError here, I think

[rvargas (doing something else), 2014-01-23 20:45:09]

thanks.

> Is there a way you can do this without reinterpret_cast?

It depends... I think I tried to avoid reinterpret_casts, and the one you
pointed out was easy to fix, but the one pointed out by kinaba requires a
reinterpret_cast no matter what.

I hear you on the behavior of casting unrelated types, but keep in mind that in
this case the types are the same: enums with exactly the same values.

https://codereview.chromium.org/145303002/diff/1/chrome/browser/chromeos/driv...
File chrome/browser/chromeos/drive/fileapi_worker.cc (right):

https://codereview.chromium.org/145303002/diff/1/chrome/browser/chromeos/driv...
chrome/browser/chromeos/drive/fileapi_worker.cc:186: base::PlatformFileError*
result =
On 2014/01/23 06:10:04, kinaba wrote:
> What about declaring this variable as base::File::Error and cast as the
argument
> of base::CreatePlatformFile, rather than doing so for RunOpenFileCallback?
> 
> I understand this is transient and may probably be safe, but still I'm anxious
> about deleting reinterpret_cast<>ed pointer in base::Owned.

Done.

https://codereview.chromium.org/145303002/diff/1/content/browser/renderer_hos...
File content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
(right):

https://codereview.chromium.org/145303002/diff/1/content/browser/renderer_hos...
content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc:130:
reinterpret_cast<base::PlatformFileError*>(&error));
On 2014/01/23 16:33:45, dmichael wrote:
> This looks pretty sketchy to me. If you can't go 100% to base::File, then
> |error| should probably still be a base::PlatformFileError here, I think

Done.

[dmichael (off chromium), 2014-01-23 21:22:08]

https://codereview.chromium.org/145303002/diff/1790007/content/browser/render...
File content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
(right):

https://codereview.chromium.org/145303002/diff/1790007/content/browser/render...
content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc:132:
return ppapi::FileErrorToPepperError(static_cast<base::File::Error>(error));
Thanks!

Suggestion: I think you should add a compile assert somewhere that each value of
base::File::Error matches the right value of PlatformFileError (including MAX).
That would make sure this static_cast is safe. You might even want a specific
named function for the conversion, since I think it's not obvious to a reader of
this code the static_cast conversion is correct.

https://codereview.chromium.org/145303002/diff/1790007/content/browser/render...
content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc:275:
NULL, reinterpret_cast<base::PlatformFileError*>(&error));
Please pass a real PlatformFileError and then convert the result to a
base::FileError after (probably the same way as you do it above, with
static_cast or a named conversion function).

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
File ppapi/proxy/file_io_resource.cc (right):

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:63:
reinterpret_cast<base::PlatformFileInfo*>(&file_info_))) {
Please define & use an explicit conversion function instead. It should only be a
few lines of code, and we won't invoke undefined behavior.

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:206:
reinterpret_cast<base::PlatformFileInfo*>(&file_info))) {
ditto

[rvargas (doing something else), 2014-01-24 03:14:52]

Thanks

-willchan
+thakis for base
+wtc for net

https://codereview.chromium.org/145303002/diff/1790007/content/browser/render...
File content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
(right):

https://codereview.chromium.org/145303002/diff/1790007/content/browser/render...
content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc:275:
NULL, reinterpret_cast<base::PlatformFileError*>(&error));
On 2014/01/23 21:22:10, dmichael wrote:
> Please pass a real PlatformFileError and then convert the result to a
> base::FileError after (probably the same way as you do it above, with
> static_cast or a named conversion function).

Done.

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
File ppapi/proxy/file_io_resource.cc (right):

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:63:
reinterpret_cast<base::PlatformFileInfo*>(&file_info_))) {
On 2014/01/23 21:22:10, dmichael wrote:
> Please define & use an explicit conversion function instead. It should only be
a
> few lines of code, and we won't invoke undefined behavior.

fixed

https://codereview.chromium.org/145303002/diff/1790007/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:206:
reinterpret_cast<base::PlatformFileInfo*>(&file_info))) {
On 2014/01/23 21:22:10, dmichael wrote:
> ditto

fixed

[Nico, 2014-01-24 04:12:48]

The one file in base lgtm

https://codereview.chromium.org/145303002/diff/2340001/base/files/file_util_p...
File base/files/file_util_proxy.h (right):

https://codereview.chromium.org/145303002/diff/2340001/base/files/file_util_p...
base/files/file_util_proxy.h:30: typedef Callback<void(File::Error)>
StatusCallback;
Hm, this being nested means it can't be forward-declared. (I guess if it's an
enum it can't be forward-declared at the moment anyways, but in c++11 mode this
will change)

[dmichael (off chromium), 2014-01-24 17:22:49]

pepper and ppapi lgtm

But there might be a simpler way to do it in ppapi/proxy/file_io_resource.h/.cc

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
File ppapi/proxy/file_io_resource.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:63: file.TakePlatformFile();
nit: This should probably have a comment about why you're doing this (presumably
so File doesn't close it on exiting scope.

Would it actually be better to change file_handle_ to a base::File?

[rvargas (doing something else), 2014-01-24 18:56:40]

Thanks again.

https://codereview.chromium.org/145303002/diff/2340001/base/files/file_util_p...
File base/files/file_util_proxy.h (right):

https://codereview.chromium.org/145303002/diff/2340001/base/files/file_util_p...
base/files/file_util_proxy.h:30: typedef Callback<void(File::Error)>
StatusCallback;
On 2014/01/24 04:12:50, Nico wrote:
> Hm, this being nested means it can't be forward-declared. (I guess if it's an
> enum it can't be forward-declared at the moment anyways, but in c++11 mode
this
> will change)

Yeah, I realized that with this CL because there were a few places with "using"
statements. Brett wanted them to be nested, and I still hope that the price is
not that high :)

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
File ppapi/proxy/file_io_resource.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:63: file.TakePlatformFile();
On 2014/01/24 17:22:51, dmichael wrote:
> nit: This should probably have a comment about why you're doing this
(presumably
> so File doesn't close it on exiting scope.
> 
> Would it actually be better to change file_handle_ to a base::File?

file_handle_ has to be changed to base::File. That's the meaning of the comment
on line 60. (but I'm using the same text everywhere to make searching easier).
PlatformFile is deprecated and is going to be removed... but ppapi is not the
module that is being cleaned up with this CL :). I'm not familiar enough with
this code to evaluate at this time how many things have to change if I change
file_handle_, but every time that I decide to change something a bunch of files
have to simultaneously change and this CL is already way too long :(

[dmichael (off chromium), 2014-01-24 19:33:30]

*pepper* and *ppapi* lgtm

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
File ppapi/proxy/file_io_resource.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/ppapi/proxy/file_io_re...
ppapi/proxy/file_io_resource.cc:63: file.TakePlatformFile();
On 2014/01/24 18:56:43, rvargas wrote:
> On 2014/01/24 17:22:51, dmichael wrote:
> > nit: This should probably have a comment about why you're doing this
> (presumably
> > so File doesn't close it on exiting scope.
> > 
> > Would it actually be better to change file_handle_ to a base::File?
> 
> file_handle_ has to be changed to base::File. That's the meaning of the
comment
> on line 60. (but I'm using the same text everywhere to make searching easier).
> PlatformFile is deprecated and is going to be removed... but ppapi is not the
> module that is being cleaned up with this CL :). I'm not familiar enough with
> this code to evaluate at this time how many things have to change if I change
> file_handle_, but every time that I decide to change something a bunch of
files
> have to simultaneously change and this CL is already way too long :(
Okay, that's fine. You can make these TODO(dmichael) if you want.

[wtc, 2014-01-24 20:41:52]

Patch set 3: net LGTM.

You can ignore my whining about the nit.

https://codereview.chromium.org/145303002/diff/2340001/net/base/directory_lis...
File net/base/directory_lister_unittest.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/net/base/directory_lis...
net/base/directory_lister_unittest.cc:114: ASSERT_TRUE(file.IsValid());

It seems that EXPECT_TRUE should suffice here.

Do we also need file.Close()?

https://codereview.chromium.org/145303002/diff/2340001/net/disk_cache/simple/...
File net/disk_cache/simple/simple_index_file_unittest.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/net/disk_cache/simple/...
net/disk_cache/simple/simple_index_file_unittest.cc:274: base::File::FLAG_CREATE
| base::File::FLAG_WRITE);

Nit: "FILE_CREATE" and "FILE_WRITE" seem better, or perhaps just "CREATE" and
"WRITE".

[rvargas (doing something else), 2014-01-24 20:55:51]

Thanks.

https://codereview.chromium.org/145303002/diff/2340001/net/base/directory_lis...
File net/base/directory_lister_unittest.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/net/base/directory_lis...
net/base/directory_lister_unittest.cc:114: ASSERT_TRUE(file.IsValid());
On 2014/01/24 20:41:56, wtc wrote:
> 
> It seems that EXPECT_TRUE should suffice here.

Could be, but all other failures on Setup are considered fatal for this code.
Hard to test what all tests will do if the directory structure they expect is
not there, but I'd suspect they would not crash (which is to say that EXPECT
would be fine).

I can change the behavior on a separate CL if you want me to.

> 
> Do we also need file.Close()?

The file is closed by the destructor.

https://codereview.chromium.org/145303002/diff/2340001/net/disk_cache/simple/...
File net/disk_cache/simple/simple_index_file_unittest.cc (right):

https://codereview.chromium.org/145303002/diff/2340001/net/disk_cache/simple/...
net/disk_cache/simple/simple_index_file_unittest.cc:274: base::File::FLAG_CREATE
| base::File::FLAG_WRITE);
On 2014/01/24 20:41:56, wtc wrote:
> 
> Nit: "FILE_CREATE" and "FILE_WRITE" seem better, or perhaps just "CREATE" and
> "WRITE".

I would have to check the review comments from that change, but I believe the
intention is to differentiate the values from various enums under File.

[commit-bot: I haz the power, 2014-01-24 20:58:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rvargas@chromium.org/145303002/2340001

[commit-bot: I haz the power, 2014-01-24 21:29:50]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[rvargas (doing something else), 2014-01-24 21:51:19]

+ justin

Missing LGTM from an OWNER for these files:
    content/common/file_utilities_messages.h
    content/common/fileapi/file_system_messages.h
    ppapi/proxy/ppapi_messages.h

[jschuh, 2014-01-24 23:23:26]

ipc security lgtm

[commit-bot: I haz the power, 2014-01-24 23:28:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rvargas@chromium.org/145303002/2340001

[commit-bot: I haz the power, 2014-01-24 23:29:58]

Failed to apply patch for
chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
  Hunk #1 succeeded at 79 (offset 5 lines).
  Hunk #2 succeeded at 90 (offset 5 lines).
  Hunk #3 succeeded at 101 (offset 5 lines).
  Hunk #4 succeeded at 111 (offset 5 lines).
  Hunk #5 succeeded at 131 (offset 5 lines).
  Hunk #6 succeeded at 152 (offset 5 lines).
  Hunk #7 succeeded at 162 (offset 5 lines).
  Hunk #8 succeeded at 174 (offset 5 lines).
  Hunk #9 succeeded at 185 (offset 5 lines).
  Hunk #10 succeeded at 195 (offset 5 lines).
  Hunk #11 succeeded at 204 (offset 5 lines).
  Hunk #12 succeeded at 213 (offset 5 lines).
  Hunk #13 succeeded at 221 (offset 5 lines).
  Hunk #14 succeeded at 231 with fuzz 1 (offset 5 lines).
  Hunk #15 succeeded at 285 (offset 31 lines).
  Hunk #16 FAILED at 298.
  Hunk #17 succeeded at 395 (offset 74 lines).
  1 out of 17 hunks FAILED -- saving rejects to file
chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc.rej

Patch:      
chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
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
41b516bb6aeebb737660fac8aa840e650b3fd09d..c93a2972457753a552f74227c2c48037f94dd943
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
@@ -74,7 +74,7 @@ void DeviceMediaAsyncFileUtil::CreateOrOpen(
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
   base::PlatformFile invalid_file = base::kInvalidPlatformFileValue;
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY,
+  callback.Run(base::File::FILE_ERROR_SECURITY,
                base::PassPlatformFile(&invalid_file),
                base::Closure());
 }
@@ -85,7 +85,7 @@ void DeviceMediaAsyncFileUtil::EnsureFileExists(
     const EnsureFileExistsCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY, false);
+  callback.Run(base::File::FILE_ERROR_SECURITY, false);
 }
 
 void DeviceMediaAsyncFileUtil::CreateDirectory(
@@ -96,7 +96,7 @@ void DeviceMediaAsyncFileUtil::CreateDirectory(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::GetFileInfo(
@@ -106,7 +106,7 @@ void DeviceMediaAsyncFileUtil::GetFileInfo(
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(url);
   if (!delegate) {
-    OnGetFileInfoError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
+    OnGetFileInfoError(callback, base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   delegate->GetFileInfo(
@@ -126,7 +126,7 @@ void DeviceMediaAsyncFileUtil::ReadDirectory(
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(url);
   if (!delegate) {
-    OnReadDirectoryError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
+    OnReadDirectoryError(callback, base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   delegate->ReadDirectory(
@@ -147,7 +147,7 @@ void DeviceMediaAsyncFileUtil::Touch(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::Truncate(
@@ -157,7 +157,7 @@ void DeviceMediaAsyncFileUtil::Truncate(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::CopyFileLocal(
@@ -169,7 +169,7 @@ void DeviceMediaAsyncFileUtil::CopyFileLocal(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::MoveFileLocal(
@@ -180,7 +180,7 @@ void DeviceMediaAsyncFileUtil::MoveFileLocal(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::CopyInForeignFile(
@@ -190,7 +190,7 @@ void DeviceMediaAsyncFileUtil::CopyInForeignFile(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::DeleteFile(
@@ -199,7 +199,7 @@ void DeviceMediaAsyncFileUtil::DeleteFile(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::DeleteDirectory(
@@ -208,7 +208,7 @@ void DeviceMediaAsyncFileUtil::DeleteDirectory(
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   NOTIMPLEMENTED();
-  callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+  callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 void DeviceMediaAsyncFileUtil::DeleteRecursively(
@@ -216,7 +216,7 @@ void DeviceMediaAsyncFileUtil::DeleteRecursively(
     const FileSystemURL& url,
     const StatusCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  callback.Run(base::PLATFORM_FILE_ERROR_INVALID_OPERATION);
+  callback.Run(base::File::FILE_ERROR_INVALID_OPERATION);
 }
 
 void DeviceMediaAsyncFileUtil::CreateSnapshotFile(
@@ -226,7 +226,7 @@ void DeviceMediaAsyncFileUtil::CreateSnapshotFile(
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(url);
   if (!delegate) {
-    OnCreateSnapshotFileError(callback, base::PLATFORM_FILE_ERROR_NOT_FOUND);
+    OnCreateSnapshotFileError(callback, base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
   base::FilePath* snapshot_file_path = new base::FilePath;
@@ -254,33 +254,33 @@ DeviceMediaAsyncFileUtil::DeviceMediaAsyncFileUtil(
 
 void DeviceMediaAsyncFileUtil::OnDidGetFileInfo(
     const AsyncFileUtil::GetFileInfoCallback& callback,
-    const base::PlatformFileInfo& file_info) {
-  callback.Run(base::PLATFORM_FILE_OK, file_info);
+    const base::File::Info& file_info) {
+  callback.Run(base::File::FILE_OK, file_info);
 }
 
 void DeviceMediaAsyncFileUtil::OnGetFileInfoError(
     const AsyncFileUtil::GetFileInfoCallback& callback,
-    base::PlatformFileError error) {
-  callback.Run(error, base::PlatformFileInfo());
+    base::File::Error error) {
+  callback.Run(error, base::File::Info());
 }
 
 void DeviceMediaAsyncFileUtil::OnDidReadDirectory(
     const AsyncFileUtil::ReadDirectoryCallback& callback,
     const AsyncFileUtil::EntryList& file_list,
     bool has_more) {
-  callback.Run(base::PLATFORM_FILE_OK, file_list, has_more);
+  callback.Run(base::File::FILE_OK, file_list, has_more);
 }
 
 void DeviceMediaAsyncFileUtil::OnReadDirectoryError(
     const AsyncFileUtil::ReadDirectoryCallback& callback,
-    base::PlatformFileError error) {
+    base::File::Error error) {
   callback.Run(error, AsyncFileUtil::EntryList(), false /*no more*/);
 }
 
 void DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
     base::SequencedTaskRunner* media_task_runner,
-    const base::PlatformFileInfo& file_info,
+    const base::File::Info& file_info,
     const base::FilePath& platform_path) {
   base::PostTaskAndReplyWithResult(
       media_task_runner,
@@ -298,19 +298,19 @@ void DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile(
 
 void DeviceMediaAsyncFileUtil::OnDidCheckMedia(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
-    const base::PlatformFileInfo& file_info,
+    const base::File::Info& file_info,
     scoped_refptr<webkit_blob::ShareableFileReference> platform_file,
-    base::PlatformFileError error) {
+    base::File::Error error) {
   base::FilePath platform_path(platform_file.get()->path());
-  if (error != base::PLATFORM_FILE_OK)
+  if (error != base::File::FILE_OK)
     platform_file = NULL;
   callback.Run(error, file_info, platform_path, platform_file);
 }
 
 void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
-    base::PlatformFileError error) {
-  callback.Run(error, base::PlatformFileInfo(), base::FilePath(),
+    base::File::Error error) {
+  callback.Run(error, base::File::Info(), base::FilePath(),
                scoped_refptr<ShareableFileReference>());
 }
 
@@ -321,12 +321,12 @@ void
DeviceMediaAsyncFileUtil::OnSnapshotFileCreatedRunTask(
     base::FilePath* snapshot_file_path) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!snapshot_file_path || snapshot_file_path->empty()) {
-    OnCreateSnapshotFileError(…
(message too large)

[commit-bot: I haz the power, 2014-01-25 02:42:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rvargas@chromium.org/145303002/3140007

[commit-bot: I haz the power, 2014-01-27 18:50:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rvargas@chromium.org/145303002/3410001

[commit-bot: I haz the power, 2014-01-27 21:36:19]

Change committed as 247301