Move the HTTP connector to FetchContext

2 files changed, 11 insertions, 2 deletions

diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs
index 7df0af9643c..8ae9ae8c784 100644
--- a/tests/unit/net/fetch.rs
+++ b/tests/unit/net/fetch.rs
@@ -23,6 +23,7 @@ use hyper::status::StatusCode;
 use hyper::uri::RequestUri;
 use hyper_openssl;
 use msg::constellation_msg::TEST_PIPELINE_ID;
+use net::connector::{create_http_connector, create_ssl_client};
 use net::fetch::cors_cache::CorsCache;
 use net::fetch::methods::FetchContext;
 use net::filemanager_thread::FileManager;
@@ -529,11 +530,15 @@ fn test_fetch_with_hsts() {
     //takes an address and something that implements hyper::net::Ssl
     let mut server = Server::https("0.0.0.0:0", ssl).unwrap().handle_threads(handler, 1).unwrap();
 
+    let ssl_client = create_ssl_client("self_signed_certificate_for_testing.crt");
+    let connector = create_http_connector(ssl_client);
+
     let context =  FetchContext {
-        state: HttpState::new("self_signed_certificate_for_testing.crt"),
+        state: HttpState::new(),
         user_agent: DEFAULT_USER_AGENT.into(),
         devtools_chan: None,
         filemanager: FileManager::new(),
+        connector: connector,
     };
 
     {
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index 30a57ee6027..740a7e6c505 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -34,6 +34,7 @@ extern crate url;
 
 use devtools_traits::DevtoolsControlMsg;
 use hyper::server::{Handler, Listening, Server};
+use net::connector::{create_http_connector, create_ssl_client};
 use net::fetch::cors_cache::CorsCache;
 use net::fetch::methods::{self, FetchContext};
 use net::filemanager_thread::FileManager;
@@ -51,11 +52,14 @@ struct FetchResponseCollector {
 }
 
 fn new_fetch_context(dc: Option<Sender<DevtoolsControlMsg>>) -> FetchContext {
+    let ssl_client = create_ssl_client("certs");
+    let connector = create_http_connector(ssl_client);
     FetchContext {
-        state: HttpState::new("certs"),
+        state: HttpState::new(),
         user_agent: DEFAULT_USER_AGENT.into(),
         devtools_chan: dc,
         filemanager: FileManager::new(),
+        connector: connector,
     }
 }
 impl FetchTaskTarget for FetchResponseCollector {