summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/file_system_operation_unittest.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 23:00:00 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 23:00:00 +0000
commita5230508efeea42e05005f43f9ffa140fbcc64c0 (patch)
tree89b4aedc784c9b0b1c93b757b35631e0fd06a884 /webkit/fileapi/file_system_operation_unittest.cc
parent55df9099f9350d906d7b03a4390687ac95269210 (diff)
downloadchromium_src-a5230508efeea42e05005f43f9ffa140fbcc64c0.zip
chromium_src-a5230508efeea42e05005f43f9ffa140fbcc64c0.tar.gz
chromium_src-a5230508efeea42e05005f43f9ffa140fbcc64c0.tar.bz2
Modify DeletableFileReference to not necessarily delete after all. Renamed the class to ShareableFileReference and fixed up the current callers with the new name and gypi files.
BUG=115603 Review URL: https://chromiumcodereview.appspot.com/9466025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_operation_unittest.cc')
-rw-r--r--webkit/fileapi/file_system_operation_unittest.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index dcd0238..aa97fb3 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -13,7 +13,7 @@
#include "base/scoped_temp_dir.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/deletable_file_reference.h"
+#include "webkit/blob/shareable_file_reference.h"
#include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_file_util.h"
#include "webkit/fileapi/file_system_mount_point_provider.h"
@@ -29,7 +29,7 @@ using quota::QuotaClient;
using quota::QuotaManager;
using quota::QuotaManagerProxy;
using quota::StorageType;
-using webkit_blob::DeletableFileReference;
+using webkit_blob::ShareableFileReference;
namespace fileapi {
@@ -170,8 +170,8 @@ class FileSystemOperationTest
const std::vector<base::FileUtilProxy::Entry>& entries() const {
return entries_;
}
- const DeletableFileReference* deletable_file_ref() const {
- return deletable_file_ref_;
+ const ShareableFileReference* shareable_file_ref() const {
+ return shareable_file_ref_;
}
virtual void SetUp();
@@ -286,11 +286,11 @@ class FileSystemOperationTest
base::PlatformFileError status,
const base::PlatformFileInfo& info,
const FilePath& platform_path,
- const scoped_refptr<DeletableFileReference>& deletable_file_ref) {
+ const scoped_refptr<ShareableFileReference>& shareable_file_ref) {
info_ = info;
path_ = platform_path;
status_ = status;
- deletable_file_ref_ = deletable_file_ref;
+ shareable_file_ref_ = shareable_file_ref;
}
// For post-operation status.
@@ -298,7 +298,7 @@ class FileSystemOperationTest
base::PlatformFileInfo info_;
FilePath path_;
std::vector<base::FileUtilProxy::Entry> entries_;
- scoped_refptr<DeletableFileReference> deletable_file_ref_;
+ scoped_refptr<ShareableFileReference> shareable_file_ref_;
private:
scoped_ptr<LocalFileUtil> local_file_util_;
@@ -1059,9 +1059,9 @@ TEST_F(FileSystemOperationTest, TestCreateSnapshotFile) {
EXPECT_FALSE(info().is_directory);
EXPECT_EQ(PlatformPath(file_path), path());
- // The FileSystemOpration implementation does not set the deletable
- // file reference.
- EXPECT_EQ(NULL, deletable_file_ref());
+ // The FileSystemOpration implementation does not create a
+ // shareable file reference.
+ EXPECT_EQ(NULL, shareable_file_ref());
}
} // namespace fileapi