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, 19 insertions, 22 deletions

diff --git a/components/script/dom/testrunner.rs b/components/script/dom/testrunner.rs
index 1783fce7223..ac354905d25 100644
--- a/components/script/dom/testrunner.rs
+++ b/components/script/dom/testrunner.rs
@@ -1,20 +1,20 @@
 /* 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 crate::dom::bindings::codegen::Bindings::TestRunnerBinding::TestRunnerMethods;
+use crate::dom::bindings::error::{Error, ErrorResult};
+use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
 use bluetooth_traits::BluetoothRequest;
-use dom::bindings::codegen::Bindings::TestRunnerBinding;
-use dom::bindings::codegen::Bindings::TestRunnerBinding::TestRunnerMethods;
-use dom::bindings::error::{Error, ErrorResult};
-use dom::bindings::js::Root;
-use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
-use dom::bindings::str::DOMString;
-use dom::globalscope::GlobalScope;
 use dom_struct::dom_struct;
-use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::ipc::IpcSender;
+use profile_traits::ipc;
 
 // https://webbluetoothcg.github.io/web-bluetooth/tests#test-runner
- #[dom_struct]
+#[dom_struct]
 pub struct TestRunner {
     reflector_: Reflector,
 }
@@ -26,10 +26,8 @@ impl TestRunner {
         }
     }
 
-    pub fn new(global: &GlobalScope) -> Root<TestRunner> {
-        reflect_dom_object(box TestRunner::new_inherited(),
-                           global,
-                           TestRunnerBinding::Wrap)
+    pub fn new(global: &GlobalScope) -> DomRoot<TestRunner> {
+        reflect_dom_object(Box::new(TestRunner::new_inherited()), global)
     }
 
     fn get_bluetooth_thread(&self) -> IpcSender<BluetoothRequest> {
@@ -39,16 +37,15 @@ impl TestRunner {
 
 impl TestRunnerMethods for TestRunner {
     // https://webbluetoothcg.github.io/web-bluetooth/tests#setBluetoothMockDataSet
+    #[allow(non_snake_case)]
     fn SetBluetoothMockDataSet(&self, dataSetName: DOMString) -> ErrorResult {
-        let (sender, receiver) = ipc::channel().unwrap();
-        self.get_bluetooth_thread().send(BluetoothRequest::Test(String::from(dataSetName), sender)).unwrap();
+        let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap();
+        self.get_bluetooth_thread()
+            .send(BluetoothRequest::Test(String::from(dataSetName), sender))
+            .unwrap();
         match receiver.recv().unwrap().into() {
-            Ok(()) => {
-                Ok(())
-            },
-            Err(error) => {
-                Err(Error::from(error))
-            },
+            Ok(()) => Ok(()),
+            Err(error) => Err(Error::from(error)),
         }
     }
 }