Add ScopedFile class which supports scope-out deletion and/or callbacks

webkit/blob/shareable_file_reference.h

 // 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.
 
 #ifndef WEBKIT_BLOB_SHAREABLE_FILE_REFERENCE_H_
 #define WEBKIT_BLOB_SHAREABLE_FILE_REFERENCE_H_
 
 #include <vector>
 
-#include "base/callback.h"
-#include "base/files/file_path.h"
-#include "base/memory/ref_counted.h"
-#include "webkit/storage/webkit_storage_export.h"
-
-namespace base {
-class TaskRunner;
-}
+#include "webkit/blob/scoped_file.h"
 
 namespace webkit_blob {
 
 // A refcounted wrapper around a FilePath that can optionally schedule
 // the file to be deleted upon final release and/or to notify a consumer
 // when final release occurs. This class is single-threaded and should
 // only be invoked on the IO thread in chrome.
 class WEBKIT_STORAGE_EXPORT ShareableFileReference
     : public base::RefCounted<ShareableFileReference> {
  public:
-  typedef base::Callback<void(const base::FilePath&)> FinalReleaseCallback;
+  typedef ScopedFile::ScopeOutCallback FinalReleaseCallback;
 
   enum FinalReleasePolicy {
     DELETE_ON_FINAL_RELEASE,
     DONT_DELETE_ON_FINAL_RELEASE,

[michaeln, 2013/04/22 21:07:03]

Maybe if these were defined in terms of the ScopedFile enums, could cast instead
of have the switch statement in the .cc file.

  DELETE_ON_FINAL_RELEASE = ScopedFile::DELETE_ON_SCOPE_OUT,

[kinuko, 2013/04/23 06:31:29]

Done.

   };
 
   // Returns a ShareableFileReference for the given path, if no reference
   // for this path exists returns NULL.
   static scoped_refptr<ShareableFileReference> Get(const base::FilePath& path);
 
   // Returns a ShareableFileReference for the given path, creating a new
   // reference if none yet exists. If there's a pre-existing reference for
-  // the path, the deletable parameter of this method is ignored.
+  // the path, the policy parameter of this method is ignored.
   static scoped_refptr<ShareableFileReference> GetOrCreate(
       const base::FilePath& path,
       FinalReleasePolicy policy,
       base::TaskRunner* file_task_runner);
 
+  // Returns a ShareableFileReference for the given path of the |scoped_file|,
+  // creating a new reference if none yet exists. The ownership of |scoped_file|
+  // is passed to this reference.
+  // If there's a pre-existing reference for the path, the scope out policy
+  // of the given |scoped_file| is ignored.
+  static scoped_refptr<ShareableFileReference> GetOrCreate(
+      ScopedFile scoped_file);
+
   // The full file path.
-  const base::FilePath& path() const { return path_; }
+  const base::FilePath& path() const { return scoped_file_.path(); }
 
-  // Whether it's to be deleted on final release.
-  FinalReleasePolicy final_release_policy() const {
-    return final_release_policy_;
-  }
-
+  // The |callback| is fired when the final reference of this instance
+  // is released. If release policy is DELETE_ON_FINAL_RELEASE the
+  // callback(s) is/are called before the deletion is scheduled.

[michaeln, 2013/04/22 21:07:03]

is the latter part of the comment is strictly true? looks like the callbacks are
scheduled prior to the deletion being scheduled, but they're not necessarily
invoked prior to that.

[kinuko, 2013/04/23 06:31:29]

Updated the comment.

   void AddFinalReleaseCallback(const FinalReleaseCallback& callback);
 
  private:
   friend class base::RefCounted<ShareableFileReference>;
 
-  ShareableFileReference(
-      const base::FilePath& path,
-      FinalReleasePolicy policy,
-      base::TaskRunner* file_task_runner);
+  ShareableFileReference(ScopedFile scoped_file);
   ~ShareableFileReference();
 
-  const base::FilePath path_;
-  const FinalReleasePolicy final_release_policy_;
-  const scoped_refptr<base::TaskRunner> file_task_runner_;
-  std::vector<FinalReleaseCallback> final_release_callbacks_;
+  ScopedFile scoped_file_;
 
   DISALLOW_COPY_AND_ASSIGN(ShareableFileReference);
 };
 
 }  // namespace webkit_blob
 
 #endif  // WEBKIT_BLOB_SHAREABLE_FILE_REFERENCE_H_