Fix removal of headers

net/http/http_response_headers.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 #define NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 47 matching lines @@
   // Appends a representation of this object to the given pickle.
   // The options argument can be a combination of PersistOptions.
   void Persist(Pickle* pickle, PersistOptions options);
 
   // Performs header merging as described in 13.5.3 of RFC 2616.
   void Update(const HttpResponseHeaders& new_headers);
 
   // Removes all instances of a particular header.
   void RemoveHeader(const std::string& name);
 
-  // Removes a particular header. The header name is compared
+  // Removes a particular header line. The header name is compared
   // case-insensitively.
-  void RemoveHeaderWithValue(const std::string& name, const std::string& value);
+  void RemoveHeaderLine(const std::string& name, const std::string& value);
 
   // Adds a particular header.  |header| has to be a single header without any
   // EOL termination, just [<header-name>: <header-values>]
   // If a header with the same name is already stored, the two headers are not
   // merged together by this method; the one provided is simply put at the
   // end of the list.
   void AddHeader(const std::string& header);
 
   // Replaces the current status line with the provided one (|new_status| should
   // not have any EOL).
@@ skipping 233 matching lines @@
                    std::string::const_iterator value_begin,
                    std::string::const_iterator value_end);
 
   // Replaces the current headers with the merged version of |raw_headers| and
   // the current headers without the headers in |headers_to_remove|. Note that
   // |headers_to_remove| are removed from the current headers (before the
   // merge), not after the merge.
   void MergeWithHeaders(const std::string& raw_headers,
                         const HeaderSet& headers_to_remove);
 
-  // Replaces the current headers with the merged version of |raw_headers| and
-  // the current headers with out the header consisting of
-  // |header_to_remove_name| and |header_to_remove_value|. Note that
-  // |header_to_remove_name| is compared case-insensitively.
-  // Note that the header to remove is removed from the current headers (before
-  // the merge), not after the merge.
-  void MergeWithHeadersWithValue(const std::string& raw_headers,
-                                 const std::string& header_to_remove_name,
-                                 const std::string& header_to_remove_value);
-
   // Adds the values from any 'cache-control: no-cache="foo,bar"' headers.
   void AddNonCacheableHeaders(HeaderSet* header_names) const;
 
   // Adds the set of header names that contain cookie values.
   static void AddSensitiveHeaders(HeaderSet* header_names);
 
   // Adds the set of rfc2616 hop-by-hop response headers.
   static void AddHopByHopHeaders(HeaderSet* header_names);
 
   // Adds the set of challenge response headers.
@@ skipping 28 matching lines @@
 
   // The parsed http version number (not normalized).
   HttpVersion parsed_http_version_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpResponseHeaders);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_RESPONSE_HEADERS_H_