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

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2e7d77a987884907027c9592b092779f2be946ff..7637ceaab2a987f249f5c1f21d2fdb0df693aaf5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3696,13 +3696,13 @@ bool RenderFrameImpl::isControlledByServiceWorker(WebDataSource& data_source) {
       kInvalidServiceWorkerHandleId;
 }
 
-int64_t RenderFrameImpl::serviceWorkerID(WebDataSource& data_source) {
+std::string RenderFrameImpl::serviceWorkerID(WebDataSource& data_source) {
   ServiceWorkerNetworkProvider* provider =
       ServiceWorkerNetworkProvider::FromDocumentState(
           DocumentState::FromDataSource(&data_source));
   if (provider->context() && provider->context()->controller())
-    return provider->context()->controller()->version_id();
-  return kInvalidServiceWorkerVersionId;
+    return provider->context()->controller()->version_uuid();
+  return std::string();
 }
 
 void RenderFrameImpl::postAccessibilityEvent(const blink::WebAXObject& obj,