ServiceWorker: add ServiceWorkerClients.claim() support (2/3).

content/browser/service_worker/service_worker_provider_host.h

 // Copyright 2013 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_PROVIDER_HOST_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_PROVIDER_HOST_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 77 matching lines @@
     return running_hosted_version_.get();
   }
 
   void SetDocumentUrl(const GURL& url);
   const GURL& document_url() const { return document_url_; }
 
   void SetTopmostFrameUrl(const GURL& url);
   const GURL& topmost_frame_url() const { return topmost_frame_url_; }
 
   // Associates to |registration| to listen for its version change events.
-  void AssociateRegistration(ServiceWorkerRegistration* registration);
+  void AssociateRegistration(ServiceWorkerRegistration* registration,
+                             bool should_notify_controller_change = false);

[michaeln, 2015/01/28 00:55:13]

This flag seems odd? Also it shouldn't have a default value per the style guide.

[xiang, 2015/01/28 05:38:35]

Done.

 
   // Clears the associated registration and stop listening to it.
   void DisassociateRegistration();
 
   // Returns false if the version is not in the expected STARTING in our
   // process state. That would be indicative of a bad IPC message.
   bool SetHostedVersionId(int64 versions_id);
 
   // Returns a handler for a request, the handler may return NULL if
   // the request doesn't require special handling.
@@ skipping 24 matching lines @@
 
   // Activates the WebContents associated with
   // { render_process_id_, render_frame_id_ }.
   // Runs the |callback| with the result in parameter describing whether the
   // focusing action was successful.
   void Focus(const FocusCallback& callback);
 
   // Asks the renderer to send back the document information.
   void GetClientInfo(int embedded_worker_id, int request_id);
 
+  // Starts using the |registration|.
+  void SetController(ServiceWorkerRegistration* registration);

[falken, 2015/01/26 08:45:13]

This API gets a bit confusing: this function is a lot like
AssociateRegistration. Is it possible to fold them into one have better naming
to make clear which one does what?

[falken, 2015/01/26 08:45:41]

I meant to write: fold them into one OR have better naming

[michaeln, 2015/01/28 00:55:13]

Agreed, please don't use SetController() as the name here.

OnClaimedByNewVersion(reg) would be in keeping with how the similar
OnSkippedWaiting(reg) is handled. Maybe this could be broken into two parts.

- first rejigger the associated registrations
- then notify them of the being claimed by a new version

That would be even more in keeping with how the similar skipped waiting is
handled. Might help get rid of that odd flag too?

+
   // Adds reference of this host's process to the |pattern|, the reference will
   // be removed in destructor.
   void AddScopedProcessReferenceToPattern(const GURL& pattern);
 
   // Methods to support cross site navigations.
   void PrepareForCrossSiteTransfer();
   void CompleteCrossSiteTransfer(
       int new_process_id,
       int new_frame_id,
       int new_provider_id,
       ServiceWorkerDispatcherHost* dispatcher_host);
   ServiceWorkerDispatcherHost* dispatcher_host() const {
     return dispatcher_host_;
   }
 
  private:
   friend class ServiceWorkerProviderHostTest;
   friend class ServiceWorkerWriteToCacheJobTest;
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerContextRequestHandlerTest,
                            UpdateBefore24Hours);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerContextRequestHandlerTest,
                            UpdateAfter24Hours);
 
   // ServiceWorkerRegistration::Listener overrides.
   void OnRegistrationFailed(ServiceWorkerRegistration* registration) override;
   void OnSkippedWaiting(ServiceWorkerRegistration* registration) override;
 
   // Sets the controller version field to |version| or if |version| is NULL,
   // clears the field.
-  void SetControllerVersionAttribute(ServiceWorkerVersion* version);
+  void SetControllerVersionAttribute(ServiceWorkerVersion* version,
+                                     bool should_notify_controller_change);
 
   void SendAssociateRegistrationMessage();
 
   // Increase/decrease this host's process reference for |pattern|.
   void IncreaseProcessReference(const GURL& pattern);
   void DecreaseProcessReference(const GURL& pattern);
 
   int render_process_id_;
   int render_frame_id_;
   int provider_id_;
   GURL document_url_;
   GURL topmost_frame_url_;
 
   std::vector<GURL> associated_patterns_;
   scoped_refptr<ServiceWorkerRegistration> associated_registration_;
 
   scoped_refptr<ServiceWorkerVersion> controlling_version_;
   scoped_refptr<ServiceWorkerVersion> running_hosted_version_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
   ServiceWorkerDispatcherHost* dispatcher_host_;
   bool allow_association_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProviderHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_PROVIDER_HOST_H_