| Index: webkit/blob/shareable_file_reference.h
|
| diff --git a/webkit/blob/shareable_file_reference.h b/webkit/blob/shareable_file_reference.h
|
| index 14405861c2e26bf2c70ab1f2820067e11db5ce53..5323cfa85f928e1b52d79b5fb8f2b5ddf3970212 100644
|
| --- a/webkit/blob/shareable_file_reference.h
|
| +++ b/webkit/blob/shareable_file_reference.h
|
| @@ -25,7 +25,7 @@ namespace webkit_blob {
|
| class WEBKIT_STORAGE_EXPORT ShareableFileReference
|
| : public base::RefCounted<ShareableFileReference> {
|
| public:
|
| - typedef base::Callback<void(const FilePath&)> FinalReleaseCallback;
|
| + typedef base::Callback<void(const base::FilePath&)> FinalReleaseCallback;
|
|
|
| enum FinalReleasePolicy {
|
| DELETE_ON_FINAL_RELEASE,
|
| @@ -34,18 +34,18 @@ class WEBKIT_STORAGE_EXPORT ShareableFileReference
|
|
|
| // Returns a ShareableFileReference for the given path, if no reference
|
| // for this path exists returns NULL.
|
| - static scoped_refptr<ShareableFileReference> Get(const FilePath& path);
|
| + 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.
|
| static scoped_refptr<ShareableFileReference> GetOrCreate(
|
| - const FilePath& path,
|
| + const base::FilePath& path,
|
| FinalReleasePolicy policy,
|
| base::TaskRunner* file_task_runner);
|
|
|
| // The full file path.
|
| - const FilePath& path() const { return path_; }
|
| + const base::FilePath& path() const { return path_; }
|
|
|
| // Whether it's to be deleted on final release.
|
| FinalReleasePolicy final_release_policy() const {
|
| @@ -58,12 +58,12 @@ class WEBKIT_STORAGE_EXPORT ShareableFileReference
|
| friend class base::RefCounted<ShareableFileReference>;
|
|
|
| ShareableFileReference(
|
| - const FilePath& path,
|
| + const base::FilePath& path,
|
| FinalReleasePolicy policy,
|
| base::TaskRunner* file_task_runner);
|
| ~ShareableFileReference();
|
|
|
| - const FilePath path_;
|
| + const base::FilePath path_;
|
| const FinalReleasePolicy final_release_policy_;
|
| const scoped_refptr<base::TaskRunner> file_task_runner_;
|
| std::vector<FinalReleaseCallback> final_release_callbacks_;
|
|
|