Validate image files before writing them to media galleries.

webkit/fileapi/mock_file_system_context.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 "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"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/test_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 
 FileSystemContext* CreateFileSystemContextForTesting(
     quota::QuotaManagerProxy* quota_manager_proxy,
     const base::FilePath& base_path) {
   ScopedVector<FileSystemMountPointProvider> additional_providers;
   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(),
       make_scoped_refptr(new quota::MockSpecialStoragePolicy()),
       quota_manager_proxy,
       additional_providers.Pass(),
       base_path,
       CreateAllowFileAccessOptions());
 }
 
 }  // namespace fileapi