From a761f2bed4379a95fa8c3e32bdee950ca83d5996 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 12 Apr 2016 18:34:52 -0400
Subject: [PATCH] Remove unused header manipulation facilities.

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

diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index e8e0ad682e1..4c40f186cd2 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -249,16 +249,7 @@ impl HttpResponse for WrappedHttpResponse {
 pub trait HttpRequestFactory {
     type R: HttpRequest;
 
-    fn create(&self, _url: Url, _method: Method) -> Result<Self::R, LoadError> {
-        panic!()
-    }
-    fn create_with_headers(&self, url: Url, method: Method, headers: Headers) -> Result<Self::R, LoadError> {
-        let mut result = self.create(url, method);
-        if let Ok(ref mut req) = result {
-            *req.headers_mut() = headers;
-        }
-        result
-    }
+    fn create_with_headers(&self, url: Url, method: Method, headers: Headers) -> Result<Self::R, LoadError>;
 }
 
 pub struct NetworkHttpRequestFactory {
@@ -300,7 +291,6 @@ impl HttpRequestFactory for NetworkHttpRequestFactory {
 pub trait HttpRequest {
     type R: HttpResponse + 'static;
 
-    fn headers_mut(&mut self) -> &mut Headers;
     fn send(self, body: &Option<Vec<u8>>) -> Result<Self::R, LoadError>;
 }
 
@@ -311,10 +301,6 @@ pub struct WrappedHttpRequest {
 impl HttpRequest for WrappedHttpRequest {
     type R = WrappedHttpResponse;
 
-    fn headers_mut(&mut self) -> &mut Headers {
-        self.request.headers_mut()
-    }
-
     fn send(self, body: &Option<Vec<u8>>) -> Result<WrappedHttpResponse, LoadError> {
         let url = self.request.url.clone();
         let mut request_writer = match self.request.start() {
diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index 36e1f120991..1176d9a92b8 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -142,13 +142,12 @@ enum ResponseType {
 }
 
 struct MockRequest {
-    headers: Headers,
     t: ResponseType
 }
 
 impl MockRequest {
     fn new(t: ResponseType) -> MockRequest {
-        MockRequest { headers: Headers::new(), t: t }
+        MockRequest { t: t }
     }
 }
 
@@ -175,8 +174,6 @@ fn response_for_request_type(t: ResponseType) -> Result<MockResponse, LoadError>
 impl HttpRequest for MockRequest {
     type R = MockResponse;
 
-    fn headers_mut(&mut self) -> &mut Headers { &mut self.headers }
-
     fn send(self, _: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
         response_for_request_type(self.t)
     }
@@ -271,21 +268,18 @@ impl HttpRequestFactory for AssertMustNotIncludeHeadersRequestFactory {
 
 struct AssertMustHaveBodyRequest {
     expected_body: Option<Vec<u8>>,
-    headers: Headers,
     t: ResponseType
 }
 
 impl AssertMustHaveBodyRequest {
     fn new(t: ResponseType, expected_body: Option<Vec<u8>>) -> Self {
-        AssertMustHaveBodyRequest { expected_body: expected_body, headers: Headers::new(), t: t }
+        AssertMustHaveBodyRequest { expected_body: expected_body, t: t }
     }
 }
 
 impl HttpRequest for AssertMustHaveBodyRequest {
     type R = MockResponse;
 
-    fn headers_mut(&mut self) -> &mut Headers { &mut self.headers }
-
     fn send(self, body: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
         assert_eq!(self.expected_body, *body);