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

webkit/fileapi/media/native_media_file_util_unittest.cc

 // Copyright (c) 2012 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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
@@ skipping 17 matching lines @@
 namespace fileapi {
 
 namespace {
 
 typedef FileSystemOperation::FileEntryList FileEntryList;
 
 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 },
 
   // 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.
+  { FPL("bar.jpg"), false, true, true, "\xFF\xD8\xFF" },  // Supported media file.
+  { FPL("sna.jpg"), false, true, false, "abc" },  // Unsupported masquerading file.
+  { FPL("baz.txt"), false, false, false, "abc" },  // Non-media file.
+  { FPL("foobar.cod"), false, false, false, "abc" },  // Unsupported media file.
 };
 
 void ExpectEqHelper(const std::string& test_name,
                     base::PlatformFileError expected,
                     base::PlatformFileError actual) {
   EXPECT_EQ(expected, actual) << test_name;
 }
 
 void ExpectMetadataEqHelper(const std::string& test_name,
                             base::PlatformFileError expected,
@@ skipping 19 matching lines @@
 }
 
 void PopulateDirectoryWithTestCases(const base::FilePath& dir,
                                     const FilteringTestCase* test_cases,
                                     size_t n) {
   for (size_t i = 0; i < n; ++i) {
     base::FilePath path = dir.Append(test_cases[i].path);
     if (test_cases[i].is_directory) {
       ASSERT_TRUE(file_util::CreateDirectory(path));
     } else {
+      base::PlatformFile file_handle;
       bool created = false;
       ASSERT_EQ(base::PLATFORM_FILE_OK,
-                NativeFileUtil::EnsureFileExists(path, &created));
+                NativeFileUtil::CreateOrOpen(

[vandebo (ex-Chrome), 2013/04/03 18:54:14]

It might be easier to use WriteFile() from base/file_util.h here.

[Kevin Bailey, 2013/04/04 16:07:28]

I agree, but that would remove a test ("created"). Is that ok ?

[vandebo (ex-Chrome), 2013/04/04 20:24:20]

I think it's ok to remove the assertion that we just created it.  We should
still assert that it exists though.

[Kevin Bailey, 2013/04/05 15:24:35]

Is this what you had in mind ?

+                    path,
+                    base::PLATFORM_FILE_CREATE_ALWAYS |
+                    base::PLATFORM_FILE_WRITE,
+                    &file_handle, &created));
+      if (test_cases[i].content) {
+        int len = strlen(test_cases[i].content);
+        ASSERT_EQ(len,
+            base::WritePlatformFile(file_handle, 0, test_cases[i].content,
+                                    len));
+      }
+      base::ClosePlatformFile(file_handle);
+      if (test_cases[i].content) {
+      }
       ASSERT_TRUE(created);
     }
   }
 }
 
 }  // namespace
 
 class NativeMediaFileUtilTest : public testing::Test {
  public:
   NativeMediaFileUtilTest()
@@ skipping 115 matching lines @@
                                  kFilteringTestCases,
                                  arraysize(kFilteringTestCases));
 
   std::set<base::FilePath::StringType> content;
   FileSystemURL url = CreateURL(FPL(""));
   bool completed = false;
   NewOperation(url)->ReadDirectory(
       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 =
         base::FilePath(kFilteringTestCases[i].path).BaseName().value();
     std::set<base::FilePath::StringType>::const_iterator found = content.find(name);
     EXPECT_EQ(kFilteringTestCases[i].visible, found != content.end());
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, CreateFileAndCreateDirectoryFiltering) {
@@ skipping 351 matching lines @@
         // Files do not exists. Touch fails.
         expectation = base::PLATFORM_FILE_ERROR_FAILED;
       }
       operation->TouchFile(
           url, time, time, base::Bind(&ExpectEqHelper, test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
+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 &&

[vandebo (ex-Chrome), 2013/04/03 18:54:14]

nit: reverse the case of the if and use continue.

[Kevin Bailey, 2013/04/04 16:07:28]

Done.

[Kevin Bailey, 2013/04/04 16:07:28]

Done.

+        kFilteringTestCases[i].visible) {
+      FileSystemURL root_url = CreateURL(FPL(""));
+      FileSystemOperation* operation = NewOperation(root_url);
+      FileSystemURL url = CreateURL(kFilteringTestCases[i].path);
+      if (kFilteringTestCases[i].media_file) {

[vandebo (ex-Chrome), 2013/04/03 18:54:14]

nit: use an "expected" variable and assign it based on this condition.  That
will let you pull the duplicated code out of the if/else.

[Kevin Bailey, 2013/04/04 16:07:28]

Done.

+        base::PlatformFileError error;
+        operation->CreateSnapshotFile(url,

[vandebo (ex-Chrome), 2013/04/03 18:54:14]

After op->CrateSnapshotFile, you should call
MessageLoop::current()->RunUntilIdle() to get all the async calls to run.  Did
you already try that? It looks like you were trying to make things synchronous
for debugging.

[Kevin Bailey, 2013/04/04 16:07:28]

Done.

+            base::Bind(CreateSnapshotCallback, &error));
+        ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+      } else {
+        base::PlatformFileError error;
+        operation->CreateSnapshotFile(url,
+            base::Bind(CreateSnapshotCallback, &error));
+        ASSERT_EQ(base::PLATFORM_FILE_ERROR_SECURITY, error);
+      }
+    }
+  }
+}
+
 }  // namespace fileapi