Upgrade headers, headers-core, and hyper_serde.

3 files changed, 8 insertions, 12 deletions

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};