Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: content/browser/fileapi/file_system_operation_impl_unittest.cc

Issue 579153002: Add update observer to file_system_operation_impl_unittest for (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/fileapi/mock_file_update_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/fileapi/file_system_operation_impl_unittest.cc
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc
index f718865c6b4d858a452a4cd5caf8acde249b5102..a49cc883361897f35489dbb1cf9073ab5cfdd75f 100644
--- a/content/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -13,6 +13,7 @@
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "content/browser/fileapi/mock_file_change_observer.h"
+#include "content/browser/fileapi/mock_file_update_observer.h"
#include "content/browser/quota/mock_quota_manager.h"
#include "content/browser/quota/mock_quota_manager_proxy.h"
#include "content/public/test/async_file_test_helper.h"
@@ -51,6 +52,8 @@ class FileSystemOperationImplTest
EXPECT_TRUE(base_.CreateUniqueTempDir());
change_observers_ =
storage::MockFileChangeObserver::CreateList(&change_observer_);
+ update_observers_ =
+ storage::MockFileUpdateObserver::CreateList(&update_observer_);
base::FilePath base_dir = base_.path().AppendASCII("filesystem");
quota_manager_ =
@@ -63,6 +66,8 @@ class FileSystemOperationImplTest
quota_manager(), base::MessageLoopProxy::current().get());
sandbox_file_system_.SetUp(base_dir, quota_manager_proxy_.get());
sandbox_file_system_.AddFileChangeObserver(&change_observer_);
+ sandbox_file_system_.AddFileUpdateObserver(&update_observer_);
+ update_observer_.Disable();
}
virtual void TearDown() OVERRIDE {
@@ -292,12 +297,14 @@ class FileSystemOperationImplTest
storage::FileSystemOperation::CopyOrMoveOption option) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->Move(
src,
dest,
option,
RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
@@ -307,6 +314,7 @@ class FileSystemOperationImplTest
storage::FileSystemOperation::CopyOrMoveOption option) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->Copy(
src,
dest,
@@ -314,6 +322,7 @@ class FileSystemOperationImplTest
FileSystemOperationRunner::CopyProgressCallback(),
RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
@@ -321,36 +330,44 @@ class FileSystemOperationImplTest
const FileSystemURL& dest) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->CopyInForeignFile(
src, dest, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error Truncate(const FileSystemURL& url, int size) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->Truncate(
url, size, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error CreateFile(const FileSystemURL& url, bool exclusive) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->CreateFile(
url, exclusive, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error Remove(const FileSystemURL& url, bool recursive) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->Remove(
url, recursive, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
@@ -359,57 +376,69 @@ class FileSystemOperationImplTest
bool recursive) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->CreateDirectory(
url,
exclusive,
recursive,
RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error GetMetadata(const FileSystemURL& url) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->GetMetadata(
url, RecordMetadataCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error ReadDirectory(const FileSystemURL& url) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->ReadDirectory(
url, RecordReadDirectoryCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error CreateSnapshotFile(const FileSystemURL& url) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->CreateSnapshotFile(
url, RecordSnapshotFileCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error FileExists(const FileSystemURL& url) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->FileExists(
url, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
base::File::Error DirectoryExists(const FileSystemURL& url) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->DirectoryExists(
url, RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
@@ -418,12 +447,14 @@ class FileSystemOperationImplTest
const base::Time& last_modified_time) {
base::File::Error status;
base::RunLoop run_loop;
+ update_observer_.Enable();
operation_runner()->TouchFile(
url,
last_access_time,
last_modified_time,
RecordStatusCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
+ update_observer_.Disable();
return status;
}
@@ -445,6 +476,8 @@ class FileSystemOperationImplTest
storage::MockFileChangeObserver change_observer_;
storage::ChangeObserverList change_observers_;
+ storage::MockFileUpdateObserver update_observer_;
+ storage::UpdateObserverList update_observers_;
base::WeakPtrFactory<FileSystemOperationImplTest> weak_factory_;
« no previous file with comments | « no previous file | content/browser/fileapi/mock_file_update_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698