From 697275dea3e4c1686301c5516f5a10faae5866f2 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 3 Nov 2016 13:43:10 +0100
Subject: [PATCH 1/3] Privatize some net modules.

---
 components/net/lib.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/net/lib.rs b/components/net/lib.rs
index 8c9a3ba4b6a..6f3b4bd3e29 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -47,23 +47,23 @@ extern crate uuid;
 extern crate webrender_traits;
 extern crate websocket;
 
-pub mod about_loader;
-pub mod blob_loader;
+mod about_loader;
+mod blob_loader;
 pub mod chrome_loader;
-pub mod connector;
-pub mod content_blocker;
+mod connector;
+mod content_blocker;
 pub mod cookie;
 pub mod cookie_storage;
 mod data_loader;
-pub mod file_loader;
+mod file_loader;
 pub mod filemanager_thread;
 pub mod hsts;
 pub mod http_loader;
 pub mod image_cache_thread;
 pub mod mime_classifier;
 pub mod resource_thread;
-pub mod storage_thread;
-pub mod websocket_loader;
+mod storage_thread;
+mod websocket_loader;
 
 /// An implementation of the [Fetch specification](https://fetch.spec.whatwg.org/)
 pub mod fetch {

From a888f075a1d79bd71a6cce550890483519c5dc8c Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Fri, 4 Nov 2016 11:46:35 +0100
Subject: [PATCH 2/3] Privatize the http_loader module.

---
 components/net/lib.rs         | 8 +++++++-
 tests/unit/net/http_loader.rs | 4 ++--
 tests/unit/net/lib.rs         | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/net/lib.rs b/components/net/lib.rs
index 6f3b4bd3e29..1ad29b77b3d 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -58,7 +58,7 @@ mod data_loader;
 mod file_loader;
 pub mod filemanager_thread;
 pub mod hsts;
-pub mod http_loader;
+mod http_loader;
 pub mod image_cache_thread;
 pub mod mime_classifier;
 pub mod resource_thread;
@@ -70,3 +70,9 @@ pub mod fetch {
     pub mod cors_cache;
     pub mod methods;
 }
+
+/// A module for re-exports of items used in unit tests.
+pub mod test {
+    pub use http_loader::{HttpRequest, HttpRequestFactory, HttpResponse, HttpState};
+    pub use http_loader::{LoadError, LoadErrorType, UIProvider, load};
+}
diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index d247e9283c7..e7f15eba36e 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -22,9 +22,9 @@ use msg::constellation_msg::{PipelineId, TEST_PIPELINE_ID};
 use net::cookie::Cookie;
 use net::cookie_storage::CookieStorage;
 use net::hsts::HstsEntry;
-use net::http_loader::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvider, load};
-use net::http_loader::{HttpResponse, LoadErrorType};
 use net::resource_thread::{AuthCacheEntry, CancellationListener};
+use net::test::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvider, load};
+use net::test::{HttpResponse, LoadErrorType};
 use net_traits::{CookieSource, IncludeSubdomains, LoadContext, LoadData};
 use net_traits::{CustomResponse, LoadOrigin, Metadata, ReferrerPolicy};
 use std::borrow::Cow;
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index 14319d51f15..4f1f91f923d 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -37,7 +37,7 @@ use devtools_traits::DevtoolsControlMsg;
 use filemanager_thread::{TestProvider, TEST_PROVIDER};
 use net::fetch::methods::{FetchContext, fetch};
 use net::filemanager_thread::FileManager;
-use net::http_loader::HttpState;
+use net::test::HttpState;
 use net_traits::FetchTaskTarget;
 use net_traits::request::Request;
 use net_traits::response::Response;

From 88285b6534da7dab2cf96d2c00a125f109d7a359 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Fri, 4 Nov 2016 12:10:53 +0100
Subject: [PATCH 3/3] Privatize the chrome_loader module.

---
 components/net/lib.rs           | 3 ++-
 tests/unit/net/chrome_loader.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/net/lib.rs b/components/net/lib.rs
index 1ad29b77b3d..267b4c6d9de 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -49,7 +49,7 @@ extern crate websocket;
 
 mod about_loader;
 mod blob_loader;
-pub mod chrome_loader;
+mod chrome_loader;
 mod connector;
 mod content_blocker;
 pub mod cookie;
@@ -73,6 +73,7 @@ pub mod fetch {
 
 /// A module for re-exports of items used in unit tests.
 pub mod test {
+    pub use chrome_loader::resolve_chrome_url;
     pub use http_loader::{HttpRequest, HttpRequestFactory, HttpResponse, HttpState};
     pub use http_loader::{LoadError, LoadErrorType, UIProvider, load};
 }
diff --git a/tests/unit/net/chrome_loader.rs b/tests/unit/net/chrome_loader.rs
index 5008fe67fc8..72776d248f7 100644
--- a/tests/unit/net/chrome_loader.rs
+++ b/tests/unit/net/chrome_loader.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use net::chrome_loader::resolve_chrome_url;
+use net::test::resolve_chrome_url;
 use url::Url;
 
 fn c(s: &str) -> Result<Url, ()> {