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

content/renderer/render_frame_impl.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/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 3678 matching lines @@
 bool RenderFrameImpl::isControlledByServiceWorker(WebDataSource& data_source) {
   ServiceWorkerNetworkProvider* provider =
       ServiceWorkerNetworkProvider::FromDocumentState(
           DocumentState::FromDataSource(&data_source));
   if (!provider->context())
     return false;
   return provider->context()->controller_handle_id() !=
       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,
                                              blink::WebAXEvent event) {
   HandleWebAccessibilityEvent(obj, event);
 }
 
 void RenderFrameImpl::handleAccessibilityFindInPageResult(
     int identifier,
     int match_index,
@@ skipping 1286 matching lines @@
         cdm_manager_
 #endif
         ));
 #endif  //  defined(ENABLE_MOJO_MEDIA)
   }
 
   return cdm_factory_.get();
 }
 
 }  // namespace content