Index: content/browser/service_worker/service_worker_cache_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_cache_unittest.cc b/content/browser/service_worker/service_worker_cache_unittest.cc |
index e7dbb07ef8c9752b7c32e4def98c99c666eb9a0d..73c6e2700d2626c1c85e1b42b8fe0ff5765e5290 100644 |
--- a/content/browser/service_worker/service_worker_cache_unittest.cc |
+++ b/content/browser/service_worker/service_worker_cache_unittest.cc |
@@ -227,12 +227,12 @@ class ServiceWorkerCacheTest : public testing::Test { |
for (int i = 0; i < 100; ++i) |
expected_blob_data_ += kTestData; |
- scoped_refptr<storage::BlobData> blob_data( |
- new storage::BlobData("blob-id:myblob")); |
+ scoped_ptr<storage::BlobDataBuilder> blob_data( |
+ new storage::BlobDataBuilder("blob-id:myblob")); |
blob_data->AppendData(expected_blob_data_); |
blob_handle_ = |
- blob_storage_context->context()->AddFinishedBlob(blob_data.get()); |
+ blob_storage_context->context()->AddFinishedBlob(*blob_data.get()); |
body_response_ = |
ServiceWorkerResponse(GURL("http://example.com/body.html"), |
@@ -364,7 +364,7 @@ class ServiceWorkerCacheTest : public testing::Test { |
base::RunLoop* run_loop, |
ServiceWorkerCache::ErrorType error, |
scoped_ptr<ServiceWorkerResponse> response, |
- scoped_ptr<storage::BlobDataHandle> body_handle) { |
+ scoped_ptr<storage::BlobDataSnapshotHandle> body_handle) { |
callback_error_ = error; |
callback_response_ = response.Pass(); |
callback_response_data_.reset(); |
@@ -384,11 +384,13 @@ class ServiceWorkerCacheTest : public testing::Test { |
run_loop->Quit(); |
} |
- void CopyBody(storage::BlobDataHandle* blob_handle, std::string* output) { |
- storage::BlobData* data = blob_handle->data(); |
- std::vector<storage::BlobData::Item> items = data->items(); |
- for (size_t i = 0, max = items.size(); i < max; ++i) |
- output->append(items[i].bytes(), items[i].length()); |
+ void CopyBody(storage::BlobDataSnapshotHandle* blob_handle, |
+ std::string* output) { |
+ const storage::BlobDataSnapshot* data = blob_handle->data(); |
+ const auto& items = data->items(); |
+ for (const auto& item : items) { |
+ output->append(item->bytes(), item->length()); |
+ } |
} |
bool VerifyKeys(const std::vector<std::string>& expected_keys) { |
@@ -437,12 +439,12 @@ class ServiceWorkerCacheTest : public testing::Test { |
ServiceWorkerResponse body_response_; |
ServiceWorkerFetchRequest no_body_request_; |
ServiceWorkerResponse no_body_response_; |
- scoped_ptr<storage::BlobDataHandle> blob_handle_; |
+ scoped_ptr<storage::BlobDataSnapshotHandle> blob_handle_; |
std::string expected_blob_data_; |
ServiceWorkerCache::ErrorType callback_error_; |
scoped_ptr<ServiceWorkerResponse> callback_response_; |
- scoped_ptr<storage::BlobDataHandle> callback_response_data_; |
+ scoped_ptr<storage::BlobDataSnapshotHandle> callback_response_data_; |
std::vector<std::string> callback_strings_; |
bool callback_closed_; |
}; |