Have media gallery (through native media file util) use MIME sniffer

chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc

 // Copyright (c) 2013 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 "chrome/browser/media_galleries/fileapi/device_media_async_file_util.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
+#include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 #include "webkit/blob/shareable_file_reference.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/isolated_context.h"
+#include "webkit/fileapi/native_file_util.h"
 
 using fileapi::FileSystemOperationContext;
 using fileapi::FileSystemURL;
 using webkit_blob::ShareableFileReference;
 
 namespace chrome {
 
 namespace {
 
 const base::FilePath::CharType kDeviceMediaAsyncFileUtilTempDir[] =
@@ skipping 278 matching lines @@
     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::FilePath& platform_path) {
   if (callback.is_null())
     return;
-  callback.Run(base::PLATFORM_FILE_OK, file_info, platform_path,
-               ShareableFileReference::GetOrCreate(
-                   platform_path,
-                   ShareableFileReference::DELETE_ON_FINAL_RELEASE,
-                   media_task_runner));
+  base::PlatformFileError* error = new base::PlatformFileError;
+  media_task_runner->PostTaskAndReply(
+          FROM_HERE,
+          base::Bind(&NativeMediaFileUtil::IsMediaFile, platform_path,
+                     base::Unretained(error)),
+          base::Bind(&DeviceMediaAsyncFileUtil::OnDidCheckMedia,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     callback, make_scoped_refptr(media_task_runner),
+                     file_info,
+                     ShareableFileReference::GetOrCreate(
+                         platform_path,
+                         ShareableFileReference::DELETE_ON_FINAL_RELEASE,
+                         media_task_runner),
+                     base::Owned(error)));
+}
+
+void DeviceMediaAsyncFileUtil::OnDidCheckMedia(
+    const AsyncFileUtil::CreateSnapshotFileCallback& callback,
+    base::SequencedTaskRunner* media_task_runner,
+    const base::PlatformFileInfo& file_info,
+    scoped_refptr<webkit_blob::ShareableFileReference> platform_file,
+    base::PlatformFileError* error) {
+  if (callback.is_null())
+    return;
+  if (*error == base::PLATFORM_FILE_OK) {

[vandebo (ex-Chrome), 2013/05/02 21:58:24]

Instead of doing the if else with the callback.Run in both, just do (it's less
duplicated code)

if (*error != base::PLATFORM_FILE_OK)
  platform_file = NULL;
callback.Run(...)

[Kevin Bailey, 2013/05/03 16:52:55]

Hope this is what you meant.

+    callback.Run(base::PLATFORM_FILE_OK, file_info, platform_file.get()->path(),
+                 platform_file);
+  } else {
+    base::FilePath platform_path(platform_file.get()->path());
+    callback.Run(*error, file_info, platform_path,
+                 scoped_refptr<ShareableFileReference>());
+  }
 }
 
 void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
     base::PlatformFileError error) {
   if (!callback.is_null())
     callback.Run(error, base::PlatformFileInfo(), base::FilePath(),
                  scoped_refptr<ShareableFileReference>());
 }
 
@@ skipping 18 matching lines @@
       base::Bind(&DeviceMediaAsyncFileUtil::OnDidCreateSnapshotFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback,
                  make_scoped_refptr(context->task_runner())),
       base::Bind(&DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 }  // namespace chrome