import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1137653: Correct the shape of the data object sent over if there are are crashes or the packet is malformed; r=jgriffin (d05804fe4)
- Bug 1121577 - Unset pref at delete_session, r=dburns (d2cefee52)
- Bug 1144907 - Restore previous context after calling marionette's gather_debug. r=davehunt (2d35526d2)
- Bug 1135846 - Expose marionette's actions code to chrome scope where applicable. r=dburns (2c91389b5)
- Bug 1118313 - newSession looks for non-conforming session_id property on Command. r=dburns (d72f256ec)
- Bug 1107706: Part 1: Change context from strings to enum (d4936c869)
- Bug 1107706: Part 2: Add error module and WebDriver error objects (95a58e4fa)
- Bug 1107706: Part 3: Add a command processor to Marionette (4ed444206)
- Bug 1107706: Part 4: Add dispatching mechanism to encapsulate connection (5a0cf4bfa)
- Bug 1107706: Part 5: Refactor Marionette chrome/content communication (a110867e3)
- Bug 1107706: Part 6: Make SpecialPowersError a prototypal Error (bebfc4e13)
- Bug 1107706: Part 7: Add timeout test for async scripts (795921b56)
- Bug 1107706: Part 8: Adapt emulator callbacks (4f0ec4ea3)
- Bug 1165395 Test Cache API after QuotaManager reset. r=janv (27ffd1273)
- Bug 1154325 P1 Add convenience routines to bind and get Blobs as strings. r=asuth (df1f9930a)
- Bug 1154325 P2 Use Blobs for CacheStorage keys to avoid encoding issues. r=ehsan (625588969)
- Bug 1179063 - Cleanup: Rename scopal back to scopeStmt. (r=me) (eaa5d8e3a)
- pointer style (39588e254)
- pointer style (7be6abefc)
- Bug 1162342 Enable sqlite WAL transactions in Cache API. r=ehsan (60a767033)
- Bug 1130452 - Remove support for the prefixMatch option in the service worker cache code; r=bkelly,baku (48d4d62f2)
- Bug 1166577 Use named sqlite params in Cache API code. r=ehsan (a0cbc5674)
- Bug 1166038 De-duplicate security info stored in the Cache API. r=ehsan (cdb8e8396)
- Bug 1166911 Modify Cache API sqlite code to use IS NULL literal when comparing an empty key. r=ehsan (a893706bf)
- Bug 1164620 - Part 1: Remove instances of #ifdef PR_LOGGING in various places. r=froydnj (69f3becd3)
- Bug 1161684 - Allow JAR channels to be intercepted by service workers. r=jdm (292f83299)
- Bug 1146169 - Check mChannel for null-ness in nsIInterceptedChannel::SetSecurityInfo(); r=jdm (9ed238664)
- Bug 1168208 - Refactor the existing logic for syncing the security info between Response and channel objects into a new helper class; r=nsm,jdm,bkelly (ea8852934)
- pointer style (b6ada460f)
- Bug 1163423 - Introduce JS_HasOwnProperty. r=bhackett (c189e58f0)
- pointer style (4693171b0)
- Bug 1163423 - Use JS_HasOwnProperty in WrapperAnswer::RecvHasOwn. r=billm (5029c2787)
- Bug 1168152 P1 Use a smaller sqlite page size and a growth increment in Cache. r=ehsan (9ad7f999f)
- Bug 1120501 P1 Make it easier to use Promise::All() from C++ code. r=nsm (95d1d5e2f)
- Bug 1120501 P2 Move Cache Add/AddAll logic to child process. r=ehsan,smaug (c71f9c49b)
- Bug 1168152 P2 Use a wrapper mozIStorageConnection for shared Cache connections. r=ehsan (f930635ac)
- Bug 1168152 P3 Perform incremental vacuum at tail end of Cache db connections. r=ehsan (df76df80c)
- Bug 1168152 P4 Add a test to verify Cache incremental vacuum works. r=ehsan (320d50436)
- Bug 1168152 P5 Follow-up to use 32kb growth size as intended in previous patches. r=me (92e2d3f27)
- Bug 1144236 - Add tests for the ignoreMethod match mode in DOM cache; r=bkelly (795a31d3c)
- Bug 1150001 - Cache API should not return Response body when matching Request with HEAD method. r=bkelly (690927f85)

dom/workers/ServiceWorkerScriptCache.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/dom/cache/CacheStorage.h"
 #include "mozilla/dom/cache/Cache.h"
 #include "nsIThreadRetargetableRequest.h"
-#include "nsSerializationHelper.h"
 
 #include "nsIPrincipal.h"
 #include "Workers.h"
@@ -441,9 +440,9 @@ public:
   }
 
   void
-  SetSecurityInfo(nsISerializable* aSecurityInfo)
+  InitChannelInfo(nsIChannel* aChannel)
   {
-    NS_SerializeToString(aSecurityInfo, mSecurityInfo);
+    mChannelInfo.InitFromChannel(aChannel);
   }
 
 private:
@@ -540,7 +539,7 @@ private:
       new InternalResponse(200, NS_LITERAL_CSTRING("OK"));
     ir->SetBody(body);
 
-    ir->SetSecurityInfo(mSecurityInfo);
+    ir->InitChannelInfo(mChannelInfo);
 
     nsRefPtr<Response> response = new Response(aCache->GetGlobalObject(), ir);
 
@@ -571,7 +570,7 @@ private:
   // Only used if the network script has changed and needs to be cached.
   nsString mNewCacheName;
 
-  nsCString mSecurityInfo;
+  ChannelInfo mChannelInfo;
 
   nsCString mMaxScope;
 
@@ -600,16 +599,7 @@ CompareNetwork::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
   MOZ_ASSERT(channel == mChannel);
 #endif
 
-  nsCOMPtr<nsISupports> infoObj;
-  mChannel->GetSecurityInfo(getter_AddRefs(infoObj));
-  if (infoObj) {
-    nsCOMPtr<nsISerializable> serializable = do_QueryInterface(infoObj);
-    if (serializable) {
-      mManager->SetSecurityInfo(serializable);
-    } else {
-      NS_WARNING("A non-serializable object was obtained from nsIChannel::GetSecurityInfo()!");
-    }
-  }
+  mManager->InitChannelInfo(mChannel);
 
   return NS_OK;
 }