Auto merge of #18871 - KiChjang:websocket-fetch-integration, r=avadacatavra

Merge functionality of WebsocketConnect into Fetch

Partial #14897.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18871)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 2 deletions

diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs
index a50cea265fd..6102736c04e 100644
--- a/components/script/document_loader.rs
+++ b/components/script/document_loader.rs
@@ -9,7 +9,8 @@
 use dom::bindings::root::Dom;
 use dom::document::Document;
 use ipc_channel::ipc::IpcSender;
-use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend};
+use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg};
+use net_traits::{ResourceThreads, IpcSend};
 use net_traits::request::RequestInit;
 use servo_url::ServoUrl;
 use std::thread;
@@ -124,7 +125,8 @@ impl DocumentLoader {
     pub fn fetch_async_background(&self,
                                   request: RequestInit,
                                   fetch_target: IpcSender<FetchResponseMsg>) {
-        self.resource_threads.sender().send(CoreResourceMsg::Fetch(request, fetch_target)).unwrap();
+        self.resource_threads.sender().send(
+            CoreResourceMsg::Fetch(request, FetchChannels::ResponseMsg(fetch_target))).unwrap();
     }
 
     /// Mark an in-progress network request complete.