Bug 1434701 P2 Don't expose internal IPC headers in ServiceWorkerRegistrationDescriptor.h and other minor fixes. r=asuth

dom/serviceworkers/ServiceWorkerDescriptor.h

@@ -6,6 +6,7 @@
 #ifndef _mozilla_dom_ServiceWorkerDescriptor_h
 #define _mozilla_dom_ServiceWorkerDescriptor_h
 
+#include "mozilla/UniquePtr.h"
 #include "nsString.h"
 
 class nsIPrincipal;

dom/serviceworkers/ServiceWorkerRegistrationDescriptor.cpp

@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
+
+#include "mozilla/dom/IPCServiceWorkerRegistrationDescriptor.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "ServiceWorkerInfo.h"
 
@@ -92,6 +94,11 @@ ServiceWorkerRegistrationDescriptor::operator=(ServiceWorkerRegistrationDescript
   return *this;
 }
 
+ServiceWorkerRegistrationDescriptor::~ServiceWorkerRegistrationDescriptor()
+{
+  // Non-default destructor to avoid exposing the IPC type in the header.
+}
+
 bool
 ServiceWorkerRegistrationDescriptor::operator==(const ServiceWorkerRegistrationDescriptor& aRight) const
 {
@@ -249,9 +256,9 @@ ServiceWorkerRegistrationDescriptor::SetWorkers(ServiceWorkerInfo* aInstalling,
 }
 
 void
-ServiceWorkerRegistrationDescriptor::SetWorkers(OptionalIPCServiceWorkerDescriptor& aInstalling,
-                                                OptionalIPCServiceWorkerDescriptor& aWaiting,
-                                                OptionalIPCServiceWorkerDescriptor& aActive)
+ServiceWorkerRegistrationDescriptor::SetWorkers(const OptionalIPCServiceWorkerDescriptor& aInstalling,
+                                                const OptionalIPCServiceWorkerDescriptor& aWaiting,
+                                                const OptionalIPCServiceWorkerDescriptor& aActive)
 {
   mData->installing() = aInstalling;
   mData->waiting() = aWaiting;

dom/serviceworkers/ServiceWorkerRegistrationDescriptor.h

@@ -7,7 +7,6 @@
 #define _mozilla_dom_ServiceWorkerRegistrationDescriptor_h
 
 #include "mozilla/Maybe.h"
-#include "mozilla/dom/IPCServiceWorkerRegistrationDescriptor.h"
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
 #include "mozilla/UniquePtr.h"
 
@@ -20,6 +19,7 @@ class PrincipalInfo;
 namespace dom {
 
 class IPCServiceWorkerRegistrationDescriptor;
+class OptionalIPCServiceWorkerDescriptor;
 class ServiceWorkerInfo;
 enum class ServiceWorkerUpdateViaCache : uint8_t;
 
@@ -57,7 +57,7 @@ public:
   ServiceWorkerRegistrationDescriptor&
   operator=(ServiceWorkerRegistrationDescriptor&& aRight);
 
-  ~ServiceWorkerRegistrationDescriptor() = default;
+  ~ServiceWorkerRegistrationDescriptor();
 
   bool
   operator==(const ServiceWorkerRegistrationDescriptor& aRight) const;
@@ -95,9 +95,9 @@ public:
              ServiceWorkerInfo* aActive);
 
   void
-  SetWorkers(OptionalIPCServiceWorkerDescriptor& aInstalling,
-             OptionalIPCServiceWorkerDescriptor& aWaiting,
-             OptionalIPCServiceWorkerDescriptor& aActive);
+  SetWorkers(const OptionalIPCServiceWorkerDescriptor& aInstalling,
+             const OptionalIPCServiceWorkerDescriptor& aWaiting,
+             const OptionalIPCServiceWorkerDescriptor& aActive);
 
   // Expose the underlying IPC type so that it can be passed via IPC.
   const IPCServiceWorkerRegistrationDescriptor&