Change some snapshot- or temporary-file related changes to use ScopedFile

webkit/fileapi/obfuscated_file_util.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 "webkit/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 839 matching lines @@
     return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
   int64 growth = -UsageForPath(file_info.name.size());
   AllocateQuota(context, growth);
   UpdateUsage(context, url, growth);
   TouchDirectory(db, file_info.parent_id);
   context->change_observers()->Notify(
       &FileChangeObserver::OnRemoveDirectory, MakeTuple(url));
   return base::PLATFORM_FILE_OK;
 }
 
-base::PlatformFileError ObfuscatedFileUtil::CreateSnapshotFile(
+webkit_blob::ScopedFile ObfuscatedFileUtil::CreateSnapshotFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
+    base::PlatformFileError* error,
     base::PlatformFileInfo* file_info,
-    base::FilePath* platform_path,
-    SnapshotFilePolicy* policy) {
-  DCHECK(policy);
+    base::FilePath* platform_path) {
   // We're just returning the local file information.
-  *policy = kSnapshotFileLocal;
-  base::PlatformFileError error = GetFileInfo(
-      context, url, file_info, platform_path);
-  if (error == base::PLATFORM_FILE_OK && file_info->is_directory) {
+  *error = GetFileInfo(context, url, file_info, platform_path);
+  if (*error == base::PLATFORM_FILE_OK && file_info->is_directory) {
     *file_info = base::PlatformFileInfo();
-    return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
+    *error = base::PLATFORM_FILE_ERROR_NOT_A_FILE;
   }
-  return error;
+  return webkit_blob::ScopedFile();
 }
 
 scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
     ObfuscatedFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* context,
     const FileSystemURL& root_url,
     bool recursive) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
       root_url.origin(), root_url.type(), false);
   if (!db) {
@@ skipping 448 matching lines @@
       new_local_path, false /* exclusive */, false /* recursive */);
   if (error != base::PLATFORM_FILE_OK)
     return error;
 
   *local_path =
       new_local_path.AppendASCII(base::StringPrintf("%08" PRId64, number));
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace fileapi