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

- Bug 1167053 - Convert NetUtil.newChannel2 callsites to use new API - update asyncFetch2 (r=sicking,paolo) (391fbfbed)
- Bug 1174982 - Add the new nsContentPolicyType values to the DBSchema.cpp static_assert; r=bkelly (8b1ec1cf3)
- Bug 1173912 Fail opaque responses for client requests. r=ehsan (591eb5352)
- Bug 1148044 - Correctly reflect frame and iframe RequestContext values; r=smaug (34779ec33)
- remove check done already at top and not preent in gecko (c0ad57261)
- Bug 1148030 - Correctly reflect object and embed RequestContext values; r=smaug (39e3859ab)

dom/html/HTMLSharedObjectElement.cpp

@@ -387,5 +387,18 @@ HTMLSharedObjectElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenPr
   return rootedObj;
 }
 
+nsContentPolicyType
+HTMLSharedObjectElement::GetContentPolicyType() const
+{
+  if (mNodeInfo->Equals(nsGkAtoms::applet)) {
+    // We use TYPE_INTERNAL_OBJECT for applet too, since it is not exposed
+    // through RequestContext yet.
+    return nsIContentPolicy::TYPE_INTERNAL_OBJECT;
+  } else {
+    MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::embed));
+    return nsIContentPolicy::TYPE_INTERNAL_EMBED;
+  }
+}
+
 } // namespace dom
 } // namespace mozilla