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

- Bug 1109751 - Request and Response constructors should set mime type. r=baku (e7ac413dc)
- Bug 1150023 - Intermittent browser_940107_home_button_in_bookmarks_toolbar.js | application crashed [@ mozilla::dom::quota::QuotaManager::AbortCloseStoragesForProcess(mozilla::dom::ContentParent *)][@ mozilla::ipc::MessageChannel::NotifyChannelClosed()]; r=bent (511258277)
- Bug 1125102 - Make QuotaManager and FileService to be independent of each other; r=bent (400a5b6de)
- Bug 1151242 - Abort version change transactions more eagerly in the event of a crash, r=khuey. (06ce6c7aa)
- Bug 1157573 - Fix transaction rollback assertions for when a transaction was never started, r=janv. (748ad3efc)
- Bug 1141555 - HTTP cache v2 generates corrupted entries, r=jduell (154e25786)
- Bug 997325 - Implement main process scriptable only flag in XPIDL (r=mrbkap) (7cb00da48)
- Bug 1149980 - Fix Telemetry crashing on shutdown for invalid timestamps during tests. r=vladan (1de0ea820)
- Bug 1157282 - Record telemetry histograms for base set when Telemetry.canRecordExtended is false. r=gfritzsche (661696b6e)
- Bug 1158251 - Fix sub-session histograms double-counting measurements the first time. r=gfritzsche (7ea56aadb)
- Bug 1164292 - Twiddle format of GetScriptLocation to match what we use for GetOrigin. r=gabor (73ef73a92)
- Bug 1164292 - Properly implement nsExpandedPrincipal::GetOrigin. r=gabor (e108cc4f4)
- Bug 1155963 Only allow NS_LITERAL_CSTRING to be used on compile-time literals r=froydnj,ehsan (d6e2f6259)

startupcache/StartupCache.cpp

@@ -81,7 +81,7 @@ StartupCache::CollectReports(nsIHandleReportCallback* aHandleReport,
   return NS_OK;
 }
 
-static const char sStartupCacheName[] = "startupCache." SC_WORDSIZE "." SC_ENDIAN;
+#define STARTUP_CACHE_NAME "startupCache." SC_WORDSIZE "." SC_ENDIAN
 
 StartupCache*
 StartupCache::GetSingleton()
@@ -196,7 +196,7 @@ StartupCache::Init()
     if (NS_FAILED(rv) && rv != NS_ERROR_FILE_ALREADY_EXISTS)
       return rv;
 
-    rv = file->AppendNative(NS_LITERAL_CSTRING(sStartupCacheName));
+    rv = file->AppendNative(NS_LITERAL_CSTRING(STARTUP_CACHE_NAME));
 
     NS_ENSURE_SUCCESS(rv, rv);