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

content/browser/service_worker/service_worker_context_watcher.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WATCHER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WATCHER_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 class ServiceWorkerContextWatcher
     : public ServiceWorkerContextObserver,
       public base::RefCountedThreadSafe<ServiceWorkerContextWatcher> {
  public:
   typedef base::Callback<void(
       const std::vector<ServiceWorkerRegistrationInfo>&)>
       WorkerRegistrationUpdatedCallback;
   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(
       scoped_refptr<ServiceWorkerContextWrapper> context,
       const WorkerRegistrationUpdatedCallback& registration_callback,
       const WorkerVersionUpdatedCallback& version_callback,
       const WorkerErrorReportedCallback& error_callback);
   void Start();
   void Stop();
 
@@ skipping 14 matching lines @@
 
   void SendRegistrationInfo(
       int64 registration_id,
       const GURL& pattern,
       ServiceWorkerRegistrationInfo::DeleteFlag delete_flag);
   void SendVersionInfo(const ServiceWorkerVersionInfo& version);
 
   // 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_;
   WorkerVersionUpdatedCallback version_callback_;
   WorkerErrorReportedCallback error_callback_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WATCHER_H_