Validate image files before writing them to media galleries.

webkit/fileapi/mock_file_system_context.cc

Index: webkit/fileapi/mock_file_system_context.cc
diff --git a/webkit/fileapi/mock_file_system_context.cc b/webkit/fileapi/mock_file_system_context.cc
index 669d431f743663d06446c41ba1f6a00b78a027c2..f61bca03565cefe841a5851eb5d9a83984f800e8 100644
--- a/webkit/fileapi/mock_file_system_context.cc
+++ b/webkit/fileapi/mock_file_system_context.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/fileapi/mock_file_system_context.h"
 
-#include "base/memory/scoped_vector.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
@@ -22,6 +21,14 @@ FileSystemContext* CreateFileSystemContextForTesting(
   additional_providers.push_back(
       new TestMountPointProvider(
           base::MessageLoopProxy::current(), base_path));
+  return CreateFileSystemContextWithAdditionalProvidersForTesting(
+      quota_manager_proxy, additional_providers.Pass(), base_path);
+}
+
+FileSystemContext* CreateFileSystemContextWithAdditionalProvidersForTesting(
+    quota::QuotaManagerProxy* quota_manager_proxy,
+    ScopedVector<FileSystemMountPointProvider> additional_providers,

[Greg Billock, 2013/05/22 16:21:59]

Does this need to add the TestMountPointProvider? If not, perhaps note that in
the .h file. Is that class public and can be added by callers?

[vandebo (ex-Chrome), 2013/05/22 18:41:17]

Added a comment about it being up to the caller.

+    const base::FilePath& base_path) {
   return new FileSystemContext(
       FileSystemTaskRunners::CreateMockTaskRunners(),
       ExternalMountPoints::CreateRefCounted().get(),