diff options
| author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 19:58:31 +0000 |
|---|---|---|
| committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 20:01:57 +0000 |
| commit | cd501a7565dd6054a120fbfe62d45b2299cfcc3b (patch) | |
| tree | efe35c31d00f40b2fa9e6dbafd5f9f694f47367e /content/browser/fileapi/recursive_operation_delegate_unittest.cc | |
| parent | 604e202d3548b701900c3771f9517103bb91486c (diff) | |
| download | chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.zip chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.tar.gz chromium_src-cd501a7565dd6054a120fbfe62d45b2299cfcc3b.tar.bz2 | |
Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single storage namespace
As discussed here:
https://groups.google.com/a/chromium.org/forum/#!topic/storage-dev/aQall8GOrS4
BUG=338338
TBR=cevans
NOTRY=true
Review URL: https://codereview.chromium.org/492873002
Cr-Commit-Position: refs/heads/master@{#291485}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi/recursive_operation_delegate_unittest.cc')
| -rw-r--r-- | content/browser/fileapi/recursive_operation_delegate_unittest.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/content/browser/fileapi/recursive_operation_delegate_unittest.cc b/content/browser/fileapi/recursive_operation_delegate_unittest.cc index a96a212..8fe83df 100644 --- a/content/browser/fileapi/recursive_operation_delegate_unittest.cc +++ b/content/browser/fileapi/recursive_operation_delegate_unittest.cc @@ -19,14 +19,14 @@ #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" -using fileapi::FileSystemContext; -using fileapi::FileSystemOperationContext; -using fileapi::FileSystemURL; +using storage::FileSystemContext; +using storage::FileSystemOperationContext; +using storage::FileSystemURL; namespace content { namespace { -class LoggingRecursiveOperation : public fileapi::RecursiveOperationDelegate { +class LoggingRecursiveOperation : public storage::RecursiveOperationDelegate { public: struct LogEntry { enum Type { @@ -41,11 +41,10 @@ class LoggingRecursiveOperation : public fileapi::RecursiveOperationDelegate { LoggingRecursiveOperation(FileSystemContext* file_system_context, const FileSystemURL& root, const StatusCallback& callback) - : fileapi::RecursiveOperationDelegate(file_system_context), + : storage::RecursiveOperationDelegate(file_system_context), root_(root), callback_(callback), - weak_factory_(this) { - } + weak_factory_(this) {} virtual ~LoggingRecursiveOperation() {} const std::vector<LogEntry>& log_entries() const { return log_entries_; } @@ -117,7 +116,7 @@ void ReportStatus(base::File::Error* out_error, // To test the Cancel() during operation, calls Cancel() of |operation| // after |counter| times message posting. -void CallCancelLater(fileapi::RecursiveOperationDelegate* operation, +void CallCancelLater(storage::RecursiveOperationDelegate* operation, int counter) { if (counter > 0) { base::MessageLoopProxy::current()->PostTask( @@ -150,7 +149,7 @@ class RecursiveOperationDelegateTest : public testing::Test { return make_scoped_ptr(context); } - fileapi::FileSystemFileUtil* file_util() { + storage::FileSystemFileUtil* file_util() { return sandbox_file_system_.file_util(); } |