#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
+#include "storage/browser/blob/blob_storage_context.h"
+#include "storage/browser/blob/blob_url_request_job.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_file_util.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_operation_runner.h"
+#include "storage/browser/fileapi/local_file_util.h"
+#include "storage/common/blob/blob_data.h"
+#include "storage/common/fileapi/file_system_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
-#include "webkit/browser/blob/blob_storage_context.h"
-#include "webkit/browser/blob/blob_url_request_job.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/local_file_util.h"
-#include "webkit/common/blob/blob_data.h"
-#include "webkit/common/fileapi/file_system_util.h"
-
-using fileapi::FileSystemOperation;
-using fileapi::FileSystemOperationRunner;
-using fileapi::FileSystemURL;
+
+using storage::FileSystemOperation;
+using storage::FileSystemOperationRunner;
+using storage::FileSystemURL;
using content::MockBlobURLRequestContext;
using content::ScopedTextBlob;
namespace {
const GURL kOrigin("http://example.com");
-const fileapi::FileSystemType kFileSystemType = fileapi::kFileSystemTypeTest;
+const storage::FileSystemType kFileSystemType = storage::kFileSystemTypeTest;
void AssertStatusEq(base::File::Error expected,
base::File::Error actual) {
bytes_written_(0),
complete_(false),
weak_factory_(this) {
- change_observers_ = fileapi::MockFileChangeObserver::CreateList(
- &change_observer_);
+ change_observers_ =
+ storage::MockFileChangeObserver::CreateList(&change_observer_);
}
virtual void SetUp() {
bool complete() const { return complete_; }
protected:
- const fileapi::ChangeObserverList& change_observers() const {
+ const storage::ChangeObserverList& change_observers() const {
return change_observers_;
}
- fileapi::MockFileChangeObserver* change_observer() {
+ storage::MockFileChangeObserver* change_observer() {
return &change_observer_;
}
return *url_request_context_;
}
- scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+ scoped_refptr<storage::FileSystemContext> file_system_context_;
scoped_refptr<MockQuotaManager> quota_manager_;
base::MessageLoopForIO loop_;
scoped_ptr<MockBlobURLRequestContext> url_request_context_;
- fileapi::MockFileChangeObserver change_observer_;
- fileapi::ChangeObserverList change_observers_;
+ storage::MockFileChangeObserver change_observer_;
+ storage::ChangeObserverList change_observers_;
base::WeakPtrFactory<FileSystemOperationImplWriteTest> weak_factory_;
TEST_F(FileSystemOperationImplWriteTest, TestWriteInvalidBlobUrl) {
- scoped_ptr<webkit_blob::BlobDataHandle> null_handle;
+ scoped_ptr<storage::BlobDataHandle> null_handle;
file_system_context_->operation_runner()->Write(
&url_request_context(), URLForPath(virtual_path_),
null_handle.Pass(), 0, RecordWriteCallback());