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

content/browser/service_worker/service_worker_context_watcher.h

Index: content/browser/service_worker/service_worker_context_watcher.h
diff --git a/content/browser/service_worker/service_worker_context_watcher.h b/content/browser/service_worker/service_worker_context_watcher.h
index 9e7fb5383733f540b1211256d58c3fd127c8f8bb..f70314121ccad6d402e6f98859281ff55bc360e6 100644
--- a/content/browser/service_worker/service_worker_context_watcher.h
+++ b/content/browser/service_worker/service_worker_context_watcher.h
@@ -28,7 +28,7 @@ class ServiceWorkerContextWatcher
   typedef base::Callback<void(const std::vector<ServiceWorkerVersionInfo>&)>
       WorkerVersionUpdatedCallback;
   typedef base::Callback<void(int64 /* registration_id */,
-                              int64 /* version_id */,
+                              std::string /* version_uuid */,
                               const ErrorInfo&)> WorkerErrorReportedCallback;
 
   ServiceWorkerContextWatcher(
@@ -63,39 +63,40 @@ class ServiceWorkerContextWatcher
   // ServiceWorkerContextObserver implements
   void OnNewLiveRegistration(int64 registration_id,
                              const GURL& pattern) override;
-  void OnNewLiveVersion(int64 version_id,
+  void OnNewLiveVersion(std::string version_uuid,
                         int64 registration_id,
                         const GURL& script_url) override;
   void OnRunningStateChanged(
-      int64 version_id,
+      std::string version_uuid,
       content::ServiceWorkerVersion::RunningStatus running_status) override;
   void OnVersionStateChanged(
-      int64 version_id,
+      std::string version_uuid,
       content::ServiceWorkerVersion::Status status) override;
   void OnMainScriptHttpResponseInfoSet(
-      int64 version_id,
+      std::string version_uuid,
       base::Time script_response_time,
       base::Time script_last_modified) override;
-  void OnErrorReported(int64 version_id,
+  void OnErrorReported(std::string version_uuid,
                        int process_id,
                        int thread_id,
                        const ErrorInfo& info) override;
-  void OnReportConsoleMessage(int64 version_id,
+  void OnReportConsoleMessage(std::string version_uuid,
                               int process_id,
                               int thread_id,
                               const ConsoleMessage& message) override;
-  void OnControlleeAdded(int64 version_id,
+  void OnControlleeAdded(std::string version_uuid,
                          const std::string& uuid,
                          int process_id,
                          int route_id,
                          ServiceWorkerProviderType type) override;
-  void OnControlleeRemoved(int64 version_id, const std::string& uuid) override;
+  void OnControlleeRemoved(std::string version_uuid,
+                           const std::string& uuid) override;
   void OnRegistrationStored(int64 registration_id,
                             const GURL& pattern) override;
   void OnRegistrationDeleted(int64 registration_id,
                              const GURL& pattern) override;
 
-  base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerVersionInfo>>
+  base::ScopedPtrHashMap<std::string, scoped_ptr<ServiceWorkerVersionInfo>>
       version_info_map_;
   scoped_refptr<ServiceWorkerContextWrapper> context_;
   WorkerRegistrationUpdatedCallback registration_callback_;