Chromium Code Reviews| Index: webkit/fileapi/file_system_operation_write_unittest.cc |
| =================================================================== |
| --- webkit/fileapi/file_system_operation_write_unittest.cc (revision 103169) |
| +++ webkit/fileapi/file_system_operation_write_unittest.cc (working copy) |
| @@ -8,6 +8,8 @@ |
| // TYPE_UI, which URLRequest doesn't allow. |
| // |
| +#include <vector> |
| + |
| #include "base/memory/scoped_ptr.h" |
| #include "base/message_loop.h" |
| #include "base/message_loop.h" |
| @@ -33,6 +35,7 @@ |
| #include "webkit/quota/quota_manager.h" |
| using quota::QuotaManager; |
| +using webkit_blob::BlobData; |
| namespace fileapi { |
| @@ -131,6 +134,17 @@ |
| return blob_storage_controller_.get(); |
| } |
| + void RegisterBlobUrl(const GURL& url, const BlobData* data) { |
|
jianli
2011/09/29 01:13:33
This helper function seems to be same as one we in
michaeln
2011/09/29 18:59:37
Done, shared as controller->AddFinishedBlob(url, d
|
| + blob_storage_controller_->RegisterUnfinalizedBlobUrl(url); |
| + for (std::vector<BlobData::Item>::const_iterator iter = |
| + data->items().begin(); |
| + iter != data->items().end(); ++iter) { |
| + blob_storage_controller_->AppendBlobDataItem(url, *iter); |
| + } |
| + blob_storage_controller_->FinalizeBlob(url, data->content_type()); |
| + } |
| + |
| + |
| private: |
| scoped_ptr<webkit_blob::BlobStorageController> blob_storage_controller_; |
| }; |
| @@ -223,8 +237,7 @@ |
| scoped_refptr<TestURLRequestContext> url_request_context( |
| new TestURLRequestContext()); |
| - url_request_context->blob_storage_controller()-> |
| - RegisterBlobUrl(blob_url, blob_data); |
| + url_request_context->RegisterBlobUrl(blob_url, blob_data); |
| operation()->Write(url_request_context, URLForPath(virtual_path_), blob_url, |
| 0); |
| @@ -244,8 +257,7 @@ |
| scoped_refptr<TestURLRequestContext> url_request_context( |
| new TestURLRequestContext()); |
| - url_request_context->blob_storage_controller()-> |
| - RegisterBlobUrl(blob_url, blob_data); |
| + url_request_context->RegisterBlobUrl(blob_url, blob_data); |
| operation()->Write(url_request_context, URLForPath(virtual_path_), |
| blob_url, 0); |
| @@ -278,8 +290,7 @@ |
| scoped_refptr<TestURLRequestContext> url_request_context( |
| new TestURLRequestContext()); |
| - url_request_context->blob_storage_controller()-> |
| - RegisterBlobUrl(blob_url, blob_data); |
| + url_request_context->RegisterBlobUrl(blob_url, blob_data); |
| operation()->Write(url_request_context, |
| URLForPath(FilePath(FILE_PATH_LITERAL("nonexist"))), |
| @@ -306,8 +317,7 @@ |
| scoped_refptr<TestURLRequestContext> url_request_context( |
| new TestURLRequestContext()); |
| - url_request_context->blob_storage_controller()-> |
| - RegisterBlobUrl(blob_url, blob_data); |
| + url_request_context->RegisterBlobUrl(blob_url, blob_data); |
| operation()->Write(url_request_context, URLForPath(virtual_subdir_path), |
| blob_url, 0); |
| @@ -327,8 +337,7 @@ |
| scoped_refptr<TestURLRequestContext> url_request_context( |
| new TestURLRequestContext()); |
| - url_request_context->blob_storage_controller()-> |
| - RegisterBlobUrl(blob_url, blob_data); |
| + url_request_context->RegisterBlobUrl(blob_url, blob_data); |
| quota_manager_->set_quota(10); |
| operation()->Write(url_request_context, URLForPath(virtual_path_), blob_url, |