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

webkit/fileapi/media/native_media_file_util_unittest.cc

Index: webkit/fileapi/media/native_media_file_util_unittest.cc
diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc
index 71afc1c3a9654ca092e681e13ae6591083a07d08..c62c8565d16c199c229e045cd7b3ddaba73ba3be 100644
--- a/webkit/fileapi/media/native_media_file_util_unittest.cc
+++ b/webkit/fileapi/media/native_media_file_util_unittest.cc
@@ -35,20 +35,28 @@ struct FilteringTestCase {
   const base::FilePath::CharType* path;
   bool is_directory;
   bool visible;
+  bool media_file;
+  const char* content;
 };
 
 const FilteringTestCase kFilteringTestCases[] = {
   // Directory should always be visible.
-  { FPL("hoge"), true, true },
-  { FPL("fuga.jpg"), true, true },
-  { FPL("piyo.txt"), true, true },
-  { FPL("moga.cod"), true, true },
+  { FPL("hoge"), true, true, false, NULL },
+  { FPL("fuga.jpg"), true, true, false, NULL },
+  { FPL("piyo.txt"), true, true, false, NULL },
+  { FPL("moga.cod"), true, true, false, NULL },
 
   // File should be visible if it's a supported media file.
-  { FPL("foo"), false, false },  // File without extension.
-  { FPL("bar.jpg"), false, true },  // Supported media file.
-  { FPL("baz.txt"), false, false },  // Non-media file.
-  { FPL("foobar.cod"), false, false },  // Unsupported media file.
+  // File without extension.
+  { FPL("foo"), false, false, false, "abc" },
+  // Supported media file.
+  { FPL("bar.jpg"), false, true, true, "\xFF\xD8\xFF" },
+  // Unsupported masquerading file.
+  { FPL("sna.jpg"), false, true, false, "abc" },
+  // Non-media file.
+  { FPL("baz.txt"), false, false, false, "abc" },
+  // Unsupported media file.
+  { FPL("foobar.cod"), false, false, false, "abc" },
 };
 
 void ExpectEqHelper(const std::string& test_name,
@@ -88,10 +96,9 @@ void PopulateDirectoryWithTestCases(const base::FilePath& dir,
     if (test_cases[i].is_directory) {
       ASSERT_TRUE(file_util::CreateDirectory(path));
     } else {
-      bool created = false;
-      ASSERT_EQ(base::PLATFORM_FILE_OK,
-                NativeFileUtil::EnsureFileExists(path, &created));
-      ASSERT_TRUE(created);
+      ASSERT_NE((const char*)NULL, test_cases[i].content);

[vandebo (ex-Chrome), 2013/04/05 17:54:52]

nit: we don't use C style casts and iirc, the assert macro doesn't deal with the
mixed types very well, so you can just ASSERT(test_cases[i].content != NULL);

[Kevin Bailey, 2013/04/05 20:39:51]

Right, the cast was to make it happy. Done.

+      int len = strlen(test_cases[i].content);
+      ASSERT_EQ(len, file_util::WriteFile(path, test_cases[i].content, len));
     }
   }
 }
@@ -226,7 +233,7 @@ TEST_F(NativeMediaFileUtilTest, ReadDirectoryFiltering) {
       url, base::Bind(&DidReadDirectory, &content, &completed));
   MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(completed);
-  EXPECT_EQ(5u, content.size());
+  EXPECT_EQ(6u, content.size());
 
   for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
     base::FilePath::StringType name =
@@ -598,4 +605,35 @@ TEST_F(NativeMediaFileUtilTest, TouchFileFiltering) {
   }
 }
 
+void CreateSnapshotCallback(base::PlatformFileError* error,
+    base::PlatformFileError result, const base::PlatformFileInfo&,
+    const base::FilePath&,
+    const scoped_refptr<webkit_blob::ShareableFileReference>&) {
+  *error = result;
+}
+
+TEST_F(NativeMediaFileUtilTest, CreateSnapshot) {
+  PopulateDirectoryWithTestCases(root_path(),
+                                 kFilteringTestCases,
+                                 arraysize(kFilteringTestCases));
+  for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
+    if (kFilteringTestCases[i].is_directory ||
+        !kFilteringTestCases[i].visible) {
+      continue;
+    }
+    FileSystemURL root_url = CreateURL(FPL(""));
+    FileSystemOperation* operation = NewOperation(root_url);
+    FileSystemURL url = CreateURL(kFilteringTestCases[i].path);
+    base::PlatformFileError expected_error, error;
+    if (kFilteringTestCases[i].media_file)
+      expected_error = base::PLATFORM_FILE_OK;
+    else
+      expected_error = base::PLATFORM_FILE_ERROR_SECURITY;
+    operation->CreateSnapshotFile(url,
+        base::Bind(CreateSnapshotCallback, &error));
+    MessageLoop::current()->RunUntilIdle();
+    ASSERT_EQ(expected_error, error);
+  }
+}
+
 }  // namespace fileapi