Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 7 insertions, 7 deletions

diff --git a/components/script/dom/mimetype.rs b/components/script/dom/mimetype.rs
index daa49908408..5e4db84fe27 100644
--- a/components/script/dom/mimetype.rs
+++ b/components/script/dom/mimetype.rs
@@ -1,12 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::MimeTypeBinding::MimeTypeMethods;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::Reflector;
-use dom::bindings::str::DOMString;
-use dom::plugin::Plugin;
+use crate::dom::bindings::codegen::Bindings::MimeTypeBinding::MimeTypeMethods;
+use crate::dom::bindings::reflector::Reflector;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::plugin::Plugin;
 use dom_struct::dom_struct;
 
 #[dom_struct]
@@ -31,7 +31,7 @@ impl MimeTypeMethods for MimeType {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-mimetype-enabledplugin
-    fn EnabledPlugin(&self) -> Root<Plugin> {
+    fn EnabledPlugin(&self) -> DomRoot<Plugin> {
         unreachable!()
     }
 }