Index: content/browser/service_worker/service_worker_browsertest.cc |
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc |
index ef49893734253fe81797091b7c9d74daa3c75e9e..22230f008b50e3ab0101e6cf99e8694a8cdea7d6 100644 |
--- a/content/browser/service_worker/service_worker_browsertest.cc |
+++ b/content/browser/service_worker/service_worker_browsertest.cc |
@@ -48,7 +48,7 @@ struct FetchResult { |
ServiceWorkerStatusCode status; |
ServiceWorkerFetchEventResult result; |
ServiceWorkerResponse response; |
- scoped_ptr<storage::BlobDataHandle> blob_data_handle; |
+ scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle; |
}; |
void RunAndQuit(const base::Closure& closure, |
@@ -122,11 +122,11 @@ ServiceWorkerVersion::FetchCallback CreateResponseReceiver( |
} |
void ReadResponseBody(std::string* body, |
- storage::BlobDataHandle* blob_data_handle) { |
+ storage::BlobDataSnapshotHandle* blob_data_handle) { |
ASSERT_TRUE(blob_data_handle); |
ASSERT_EQ(1U, blob_data_handle->data()->items().size()); |
- *body = std::string(blob_data_handle->data()->items()[0].bytes(), |
- blob_data_handle->data()->items()[0].length()); |
+ *body = std::string(blob_data_handle->data()->items()[0]->bytes(), |
+ blob_data_handle->data()->items()[0]->length()); |
} |
void ExpectResultAndRun(bool expected, |
@@ -472,7 +472,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest { |
void FetchOnRegisteredWorker( |
ServiceWorkerFetchEventResult* result, |
ServiceWorkerResponse* response, |
- scoped_ptr<storage::BlobDataHandle>* blob_data_handle) { |
+ scoped_ptr<storage::BlobDataSnapshotHandle>* blob_data_handle) { |
blob_context_ = ChromeBlobStorageContext::GetFor( |
shell()->web_contents()->GetBrowserContext()); |
bool prepare_result = false; |
@@ -494,10 +494,11 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest { |
ASSERT_EQ(SERVICE_WORKER_OK, fetch_result.status); |
} |
- void FetchTestHelper(const std::string& worker_url, |
- ServiceWorkerFetchEventResult* result, |
- ServiceWorkerResponse* response, |
- scoped_ptr<storage::BlobDataHandle>* blob_data_handle) { |
+ void FetchTestHelper( |
+ const std::string& worker_url, |
+ ServiceWorkerFetchEventResult* result, |
+ ServiceWorkerResponse* response, |
+ scoped_ptr<storage::BlobDataSnapshotHandle>* blob_data_handle) { |
RunOnIOThread( |
base::Bind(&self::SetUpRegistrationOnIOThread, this, worker_url)); |
FetchOnRegisteredWorker(result, response, blob_data_handle); |
@@ -697,7 +698,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) { |
ServiceWorkerFetchEventResult result; |
ServiceWorkerResponse response; |
- scoped_ptr<storage::BlobDataHandle> blob_data_handle; |
+ scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle; |
FetchTestHelper("/service_worker/fetch_event.js", |
&result, &response, &blob_data_handle); |
ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result); |
@@ -741,7 +742,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, SyncEventHandled) { |
&self::SetUpRegistrationOnIOThread, this, "/service_worker/sync.js")); |
ServiceWorkerFetchEventResult result; |
ServiceWorkerResponse response; |
- scoped_ptr<storage::BlobDataHandle> blob_data_handle; |
+ scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle; |
// Should 404 before sync event. |
FetchOnRegisteredWorker(&result, &response, &blob_data_handle); |
EXPECT_EQ(404, response.status_code); |