9 files changed, 23 insertions, 27 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 560aa612203..e979db00765 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -23,11 +23,11 @@ devtools_traits = {path = "../devtools_traits"}
 embedder_traits = { path = "../embedder_traits" }
 flate2 = "1"
 futures = "0.1"
-headers-core = "0.0.1"
-headers-ext = "0.0.3"
+headers-core = "0.1"
+headers = "0.2"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 hyper-openssl = "0.7"
 immeta = "0.4"
 ipc-channel = "0.11"
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 4022ca6b9bb..bb7b6595b76 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -10,8 +10,7 @@ use crate::http_loader::{set_default_accept, set_default_accept_language};
 use crate::subresource_integrity::is_response_integrity_valid;
 use crossbeam_channel::{unbounded, Receiver, Sender};
 use devtools_traits::DevtoolsControlMsg;
-use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlExposeHeaders, ContentType, Range};
+use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt, Range};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use hyper::Method;
 use hyper::StatusCode;
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index bce75e6a2d6..4e0e37dae77 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -5,7 +5,7 @@
 use crate::fetch::methods::{CancellationListener, Data, RangeRequestBounds};
 use crossbeam_channel::Sender;
 use embedder_traits::{EmbedderMsg, EmbedderProxy, FilterPattern};
-use headers_ext::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
+use headers::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
 use http::header::{self, HeaderValue};
 use ipc_channel::ipc::{self, IpcSender};
 use mime::{self, Mime};
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs
index a228bd39004..7a8fb9aac2b 100644
--- a/components/net/http_cache.rs
+++ b/components/net/http_cache.rs
@@ -9,8 +9,9 @@
 
 use crate::fetch::methods::{Data, DoneChannel};
 use crossbeam_channel::{unbounded, Sender};
-use headers_core::HeaderMapExt;
-use headers_ext::{CacheControl, ContentRange, Expires, LastModified, Pragma, Range, Vary};
+use headers::{
+    CacheControl, ContentRange, Expires, HeaderMapExt, LastModified, Pragma, Range, Vary,
+};
 use http::header::HeaderValue;
 use http::{header, HeaderMap};
 use hyper::{Method, StatusCode};
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 6574623232d..3f8723ce051 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -19,15 +19,15 @@ use devtools_traits::{
     ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest,
 };
 use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
-use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders};
-use headers_ext::{
+use headers::authorization::Basic;
+use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, HeaderMapExt};
+use headers::{
     AccessControlAllowMethods, AccessControlRequestHeaders, AccessControlRequestMethod,
     Authorization,
 };
-use headers_ext::{AccessControlAllowOrigin, AccessControlMaxAge, Basic};
-use headers_ext::{CacheControl, ContentEncoding, ContentLength};
-use headers_ext::{
+use headers::{AccessControlAllowOrigin, AccessControlMaxAge};
+use headers::{CacheControl, ContentEncoding, ContentLength};
+use headers::{
     Host, IfModifiedSince, LastModified, Origin as HyperOrigin, Pragma, Referer, UserAgent,
 };
 use http::header::{self, HeaderName, HeaderValue};
diff --git a/components/net/tests/data_loader.rs b/components/net/tests/data_loader.rs
index 03f6bd11fa4..9d1943def74 100644
--- a/components/net/tests/data_loader.rs
+++ b/components/net/tests/data_loader.rs
@@ -3,8 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::fetch;
-use headers_core::HeaderMapExt;
-use headers_ext::ContentType;
+use headers::{ContentType, HeaderMapExt};
 use hyper_serde::Serde;
 use mime::{self, Mime};
 use net_traits::request::{Origin, Request};
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index 147e1167086..b05635ee3b9 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -12,12 +12,9 @@ use crate::{
 use crossbeam_channel::{unbounded, Sender};
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
-use headers_core::HeaderMapExt;
-use headers_ext::{
-    AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin,
-};
-use headers_ext::{AccessControlAllowMethods, AccessControlMaxAge};
-use headers_ext::{
+use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin};
+use headers::{AccessControlAllowMethods, AccessControlMaxAge, HeaderMapExt};
+use headers::{
     CacheControl, ContentLength, ContentType, Expires, Host, LastModified, Pragma, UserAgent,
 };
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index a28c07fd867..de01076c595 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -14,11 +14,11 @@ use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEve
 use flate2::write::{DeflateEncoder, GzEncoder};
 use flate2::Compression;
 use futures::{self, Future, Stream};
-use headers_core::HeaderMapExt;
-use headers_ext::{
-    AccessControlAllowOrigin, Authorization, Basic, ContentLength, Date, Host, Origin,
+use headers::authorization::Basic;
+use headers::{
+    AccessControlAllowOrigin, Authorization, ContentLength, Date, HeaderMapExt, Host, Origin,
+    StrictTransportSecurity, UserAgent,
 };
-use headers_ext::{StrictTransportSecurity, UserAgent};
 use http::header::{self, HeaderMap, HeaderValue};
 use http::uri::Authority;
 use http::{Method, StatusCode};
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index 67e6e256274..451ec6930e6 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -8,7 +8,7 @@ use crate::fetch::methods::should_be_blocked_due_to_bad_port;
 use crate::hosts::replace_host;
 use crate::http_loader::HttpState;
 use embedder_traits::resources::{self, Resource};
-use headers_ext::Host;
+use headers::Host;
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use http::uri::Authority;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};