Index: content/browser/service_worker/embedded_worker_test_helper.cc |
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc |
index 5856822cca3e374466b7358e608690538871c9ca..bb670ffc1ea4b941d09acfc9a987cb89889f1a6d 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.cc |
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc |
@@ -110,12 +110,12 @@ void EmbeddedWorkerTestHelper::ShutdownContext() { |
void EmbeddedWorkerTestHelper::OnStartWorker( |
int embedded_worker_id, |
- int64 service_worker_version_id, |
+ std::string service_worker_version_uuid, |
const GURL& scope, |
const GURL& script_url, |
bool pause_after_download) { |
- embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] = |
- service_worker_version_id; |
+ embedded_worker_id_service_worker_version_uuid_map_[embedded_worker_id] = |
+ service_worker_version_uuid; |
if (pause_after_download) { |
SimulatePausedAfterDownload(embedded_worker_id); |
return; |
@@ -220,9 +220,9 @@ void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection( |
void EmbeddedWorkerTestHelper::SimulateWorkerScriptCached( |
int embedded_worker_id) { |
- int64 version_id = |
- embedded_worker_id_service_worker_version_id_map_[embedded_worker_id]; |
- ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); |
+ std::string version_uuid = |
+ embedded_worker_id_service_worker_version_uuid_map_[embedded_worker_id]; |
+ ServiceWorkerVersion* version = context()->GetLiveVersion(version_uuid); |
if (!version || version->script_cache_map()->size()) |
return; |
std::vector<ServiceWorkerDatabase::ResourceRecord> records; |
@@ -281,12 +281,9 @@ void EmbeddedWorkerTestHelper::OnStartWorkerStub( |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker, |
- weak_factory_.GetWeakPtr(), |
- params.embedded_worker_id, |
- params.service_worker_version_id, |
- params.scope, |
- params.script_url, |
- params.pause_after_download)); |
+ weak_factory_.GetWeakPtr(), params.embedded_worker_id, |
+ params.service_worker_version_uuid, params.scope, |
+ params.script_url, params.pause_after_download)); |
} |
void EmbeddedWorkerTestHelper::OnResumeAfterDownloadStub( |