Index: content/browser/fileapi/recursive_operation_delegate_unittest.cc |
diff --git a/content/browser/fileapi/recursive_operation_delegate_unittest.cc b/content/browser/fileapi/recursive_operation_delegate_unittest.cc |
index a96a21213a23431842b025dd28bfc653db189cf0..67cbc6978122de485fa1b05e11cb394daa15d979 100644 |
--- a/content/browser/fileapi/recursive_operation_delegate_unittest.cc |
+++ b/content/browser/fileapi/recursive_operation_delegate_unittest.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/browser/fileapi/recursive_operation_delegate.h" |
+#include "storage/browser/fileapi/recursive_operation_delegate.h" |
#include <vector> |
@@ -15,18 +15,18 @@ |
#include "base/run_loop.h" |
#include "content/public/test/sandbox_file_system_test_helper.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webkit/browser/fileapi/file_system_file_util.h" |
-#include "webkit/browser/fileapi/file_system_operation.h" |
-#include "webkit/browser/fileapi/file_system_operation_runner.h" |
+#include "storage/browser/fileapi/file_system_file_util.h" |
+#include "storage/browser/fileapi/file_system_operation.h" |
+#include "storage/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(); |
} |