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

content/browser/devtools/protocol/service_worker_handler.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_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_
 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 33 matching lines @@
   void Detached();
 
   // Protocol 'service worker' domain implementation.
   Response Enable();
   Response Disable();
   Response SendMessage(const std::string& worker_id,
                        const std::string& message);
   Response Stop(const std::string& worker_id);
   Response Unregister(const std::string& scope_url);
   Response StartWorker(const std::string& scope_url);
-  Response StopWorker(const std::string& version_id);
+  Response StopWorker(const std::string& version_uuid);
   Response UpdateRegistration(const std::string& scope_url);
-  Response InspectWorker(const std::string& version_id);
-  Response SkipWaiting(const std::string& version_id);
+  Response InspectWorker(const std::string& version_uuid);
+  Response SkipWaiting(const std::string& version_uuid);
   Response SetDebugOnStart(bool debug_on_start);
   Response DeliverPushMessage(const std::string& origin,
                               const std::string& registration_id,
                               const std::string& data);
   Response GetTargetInfo(const std::string& target_id,
                          scoped_refptr<TargetInfo>* target_info);
   Response ActivateTarget(const std::string& target_id);
 
   // WorkerDevToolsManager::Observer implementation.
   void WorkerCreated(ServiceWorkerDevToolsAgentHost* host) override;
   void WorkerReadyForInspection(ServiceWorkerDevToolsAgentHost* host) override;
   void WorkerDestroyed(ServiceWorkerDevToolsAgentHost* host) override;
   void DebugOnStartUpdated(bool debug_on_start) override;
 
  private:
   // DevToolsAgentHostClient overrides.
   void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
                                const std::string& message) override;
   void AgentHostClosed(DevToolsAgentHost* agent_host,
                        bool replaced_with_another_client) override;
 
   void ReportWorkerCreated(ServiceWorkerDevToolsAgentHost* host);
   void ReportWorkerTerminated(ServiceWorkerDevToolsAgentHost* host);
 
   void OnWorkerRegistrationUpdated(
       const std::vector<ServiceWorkerRegistrationInfo>& registrations);
   void OnWorkerVersionUpdated(
       const std::vector<ServiceWorkerVersionInfo>& registrations);
   void OnErrorReported(int64 registration_id,
-                       int64 version_id,
+                       std::string version_uuid,
                        const ServiceWorkerContextObserver::ErrorInfo& info);
 
   void OpenNewDevToolsWindow(int process_id, int devtools_agent_route_id);
 
   scoped_refptr<ServiceWorkerContextWrapper> context_;
   scoped_ptr<Client> client_;
   ServiceWorkerDevToolsAgentHost::Map attached_hosts_;
   bool enabled_;
   std::set<GURL> urls_;
   scoped_refptr<ServiceWorkerContextWatcher> context_watcher_;
   RenderFrameHostImpl* render_frame_host_;
 
   base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandler);
 };
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_