Fix removal of headers

net/http/http_response_headers_unittest.cc

 // 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.
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/time.h"
@@ skipping 1624 matching lines @@
     std::string resulting_headers;
     parsed->GetNormalizedHeaders(&resulting_headers);
     EXPECT_EQ(std::string(tests[i].expected_headers), resulting_headers);
   }
 }
 
 TEST(HttpResponseHeadersTest, RemoveIndividualHeader) {
   const struct {
     const char* orig_headers;
     const char* to_remove_name;
-    const char* to_remove_value;
+    const char* to_remove_values;

[rvargas (doing something else), 2012/07/19 19:11:02]

nit: I would still use singular here.

[battre, 2012/07/23 13:31:11]

Done.

     const char* expected_headers;
   } tests[] = {
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Cache-control: max-age=10000\n"
       "Content-Length: 450\n",
 
       "Content-Length",
 
       "450",
@@ skipping 22 matching lines @@
 
       "Content-Length",  // Matching name.
 
       "999",  // Mismatching value.
 
       "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Content-Length: 450\n"
       "Cache-control: max-age=10000\n"
     },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive  \n"
+      "Foo: bar, baz\n"

[rvargas (doing something else), 2012/07/19 19:11:02]

How about adding another "Foo: bar\n" line here (to cover multiple lines with
the same name).

[battre, 2012/07/23 13:31:11]

Done.

+      "Cache-control: max-age=10000\n",
 
+      "Foo",
+
+      "bar, baz",  // Space in value.
+
+      "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Cache-control: max-age=10000\n"
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive  \n"
+      "Foo: bar, baz\n"
+      "Cache-control: max-age=10000\n",
+
+      "Foo",
+
+      "baz",  // Only partial match -> ignored.
+
+      "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Foo: bar, baz\n"
+      "Cache-control: max-age=10000\n"
+    },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string orig_headers(tests[i].orig_headers);
     HeadersToRaw(&orig_headers);
     scoped_refptr<net::HttpResponseHeaders> parsed(
         new net::HttpResponseHeaders(orig_headers));
 
     std::string name(tests[i].to_remove_name);
-    std::string value(tests[i].to_remove_value);
-    parsed->RemoveHeaderWithValue(name, value);
+    std::string values(tests[i].to_remove_values);
+    parsed->RemoveHeaderLine(name, values);
 
     std::string resulting_headers;
     parsed->GetNormalizedHeaders(&resulting_headers);
     EXPECT_EQ(std::string(tests[i].expected_headers), resulting_headers);
   }
 }
 
 TEST(HttpResponseHeadersTest, ReplaceStatus) {
   const struct {
     const char* orig_headers;
@@ skipping 68 matching lines @@
   EXPECT_EQ(parsed->response_code(), recreated->response_code());
   EXPECT_EQ(parsed->GetContentLength(), recreated->GetContentLength());
   EXPECT_EQ(parsed->IsKeepAlive(), recreated->IsKeepAlive());
 
   std::string normalized_parsed;
   parsed->GetNormalizedHeaders(&normalized_parsed);
   std::string normalized_recreated;
   parsed->GetNormalizedHeaders(&normalized_recreated);
   EXPECT_EQ(normalized_parsed, normalized_recreated);
 }