Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3)

content/browser/service_worker/embedded_worker_test_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 
 #include <map>
 #include <string>
 
 #include "base/atomic_sequence_num.h"
@@ skipping 92 matching lines @@
   return wrapper_->context();
 }
 
 void EmbeddedWorkerTestHelper::ShutdownContext() {
   wrapper_->Shutdown();
   wrapper_ = NULL;
 }
 
 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;
   }
   SimulateWorkerReadyForInspection(embedded_worker_id);
   SimulateWorkerScriptCached(embedded_worker_id);
   SimulateWorkerScriptLoaded(next_thread_id_++, embedded_worker_id);
   SimulateWorkerScriptEvaluated(embedded_worker_id);
   SimulateWorkerStarted(embedded_worker_id);
 }
@@ skipping 84 matching lines @@
 void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection(
     int embedded_worker_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
   ASSERT_TRUE(worker != NULL);
   registry()->OnWorkerReadyForInspection(worker->process_id(),
                                          embedded_worker_id);
 }
 
 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;
   // Add a dummy ResourceRecord for the main script to the script cache map of
   // the ServiceWorkerVersion. We use embedded_worker_id for resource_id to
   // avoid ID collision.
   records.push_back(ServiceWorkerDatabase::ResourceRecord(
       embedded_worker_id, version->script_url(), 100));
   version->script_cache_map()->SetResources(records);
 }
@@ skipping 38 matching lines @@
 
 void EmbeddedWorkerTestHelper::OnStartWorkerStub(
     const EmbeddedWorkerMsg_StartWorker_Params& params) {
   EmbeddedWorkerInstance* worker =
       registry()->GetWorker(params.embedded_worker_id);
   ASSERT_TRUE(worker != NULL);
   EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
   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(
       int embedded_worker_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
   ASSERT_TRUE(worker != NULL);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&EmbeddedWorkerTestHelper::OnResumeAfterDownload,
                  weak_factory_.GetWeakPtr(),
@@ skipping 72 matching lines @@
 
 MessagePortMessageFilter*
 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() {
   scoped_refptr<MessagePortMessageFilter> filter(
       new MockMessagePortMessageFilter);
   message_port_message_filters_.push_back(filter);
   return filter.get();
 }
 
 }  // namespace content