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

content/renderer/shared_worker/embedded_shared_worker_stub.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/renderer/shared_worker/embedded_shared_worker_stub.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "content/child/appcache/appcache_dispatcher.h"
 #include "content/child/appcache/web_application_cache_host_impl.h"
 #include "content/child/request_extra_data.h"
@@ skipping 76 matching lines @@
   }
 
   virtual bool isControlledByServiceWorker(
       blink::WebDataSource& data_source) {
     ServiceWorkerNetworkProvider* provider =
         GetNetworkProviderFromDataSource(&data_source);
     return provider->context()->controller_handle_id() !=
         kInvalidServiceWorkerHandleId;
   }
 
-  virtual int64_t serviceWorkerID(
+  virtual std::string serviceWorkerID(
       blink::WebDataSource& data_source) {
     ServiceWorkerNetworkProvider* provider =
         GetNetworkProviderFromDataSource(&data_source);
     if (provider->context()->controller())
-      return provider->context()->controller()->version_id();
-    return kInvalidServiceWorkerVersionId;
+      return provider->context()->controller()->version_uuid();
+    return std::string();
   }
 
  private:
   ServiceWorkerNetworkProvider* GetNetworkProviderFromDataSource(
       const blink::WebDataSource* data_source) {
     return ServiceWorkerNetworkProvider::FromDocumentState(
         static_cast<DataSourceExtraData*>(data_source->extraData()));
   }
 };
 
@@ skipping 177 matching lines @@
   }
 }
 
 void EmbeddedSharedWorkerStub::OnTerminateWorkerContext() {
   // After this we wouldn't get any IPC for this stub.
   running_ = false;
   impl_->terminateWorkerContext();
 }
 
 }  // namespace content