Use crossbeam channel instead of servo channel. Fix rebase issues and add comment

1 files changed, 3 insertions, 3 deletions

diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 19736de1136..bd9dfce2dab 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -640,7 +640,7 @@ fn scheme_fetch(
 
                     // Setup channel to receive cross-thread messages about the file fetch
                     // operation.
-                    let (done_sender, done_receiver) = channel();
+                    let (done_sender, done_receiver) = unbounded();
                     *done_chan = Some((done_sender.clone(), done_receiver));
                     *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]);
 
@@ -687,12 +687,12 @@ fn scheme_fetch(
                 },
             };
 
-            let mut response = Response::new(url);
+            let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type()));
             if is_range_request {
                 partial_content(&mut response);
             }
 
-            let (done_sender, done_receiver) = channel();
+            let (done_sender, done_receiver) = unbounded();
             *done_chan = Some((done_sender.clone(), done_receiver));
             *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]);
             let check_url_validity = true;