Implement ServiceWorkerClient attributes [2/3]

content/browser/service_worker/service_worker_version.h

Index: content/browser/service_worker/service_worker_version.h
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 7f6f74900370982846209114b62bd8df8375995f..e889c1bbeefb56e5d6938d91b4353ac2a7a700cd 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -249,6 +249,8 @@ class CONTENT_EXPORT ServiceWorkerVersion
   bool is_doomed() const { return is_doomed_; }
 
  private:
+  class GetClientInfoCallback;
+
   friend class base::RefCounted<ServiceWorkerVersion>;
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,
                            ActivateWaitingVersion);
@@ -287,6 +289,9 @@ class CONTENT_EXPORT ServiceWorkerVersion
 
   // Message handlers.
   void OnGetClientDocuments(int request_id);
+  void OnGetClientInfoSuccess(int request_id,
+                              const ServiceWorkerClientInfo& info);
+  void OnGetClientInfoError(int request_id);
   void OnActivateEventFinished(int request_id,
                                blink::WebServiceWorkerEventResult result);
   void OnInstallEventFinished(int request_id,
@@ -327,6 +332,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   IDMap<StatusCallback, IDMapOwnPointer> notification_click_callbacks_;
   IDMap<StatusCallback, IDMapOwnPointer> push_callbacks_;
   IDMap<StatusCallback, IDMapOwnPointer> geofencing_callbacks_;
+  IDMap<GetClientInfoCallback> get_client_info_callbacks_;

[dcheng, 2014/12/10 06:37:52]

Is it guaranteed that OnStopped() gets called before ~ServiceWorkerVersion?

[Kunihiko Sakamoto, 2014/12/10 09:10:47]

Now ~ServiceWorkerVersion frees up all the callbacks.

 
   ControlleeMap controllee_map_;
   ControlleeByIDMap controllee_by_id_;