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

content/renderer/service_worker/embedded_worker_dispatcher.cc

 // Copyright 2013 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/renderer/service_worker/embedded_worker_dispatcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
@@ skipping 53 matching lines @@
   RenderThreadImpl::current()->thread_safe_sender()->Send(
       new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
   workers_.Remove(embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::OnStartWorker(
     const EmbeddedWorkerMsg_StartWorker_Params& params) {
   DCHECK(!workers_.Lookup(params.embedded_worker_id));
   TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStartWorker");
   RenderThread::Get()->EnsureWebKitInitialized();
-  scoped_ptr<WorkerWrapper> wrapper(
-      new WorkerWrapper(blink::WebEmbeddedWorker::create(
-                            new ServiceWorkerContextClient(
-                                params.embedded_worker_id,
-                                params.service_worker_version_id,
-                                params.scope,
-                                params.script_url,
-                                params.worker_devtools_agent_route_id),
-                            NULL),
-                        params.worker_devtools_agent_route_id));
+  scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
+      blink::WebEmbeddedWorker::create(
+          new ServiceWorkerContextClient(params.embedded_worker_id,
+                                         params.service_worker_version_uuid,
+                                         params.scope, params.script_url,
+                                         params.worker_devtools_agent_route_id),
+          NULL),
+      params.worker_devtools_agent_route_id));
 
   blink::WebEmbeddedWorkerStartData start_data;
   start_data.scriptURL = params.script_url;
   start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
   start_data.pauseAfterDownloadMode =
       params.pause_after_download ?
           blink::WebEmbeddedWorkerStartData::PauseAfterDownload :
           blink::WebEmbeddedWorkerStartData::DontPauseAfterDownload;
   start_data.waitForDebuggerMode =
       params.wait_for_debugger ?
@@ skipping 25 matching lines @@
                "EmbeddedWorkerDispatcher::OnResumeAfterDownload");
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   if (!wrapper) {
     LOG(WARNING) << "Got OnResumeAfterDownload for nonexistent worker";
     return;
   }
   wrapper->worker()->resumeAfterDownload();
 }
 
 }  // namespace content