Improve merging of header modifications in webRequest.OnHeadersReceived

net/http/http_response_headers_unittest.cc

 // Copyright (c) 2011 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/pickle.h"
 #include "base/time.h"
 #include "net/http/http_response_headers.h"
@@ skipping 1606 matching lines @@
 
     std::string name(tests[i].to_remove);
     parsed->RemoveHeader(name);
 
     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* 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",
+
+      "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"
+      "Content-Length  : 450  \n"
+      "Cache-control: max-age=10000\n",
+
+      "Content-Length",
+
+      "450",
+
+      "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"
+      "Content-Length: 450\n"
+      "Cache-control: max-age=10000\n",
+
+      "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"
+    },
+
+  };
+
+  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 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;
     const char* new_status;
     const char* expected_headers;
   } tests[] = {
     { "HTTP/1.1 206 Partial Content\n"
       "connection: keep-alive\n"
       "Cache-control: max-age=10000\n"
       "Content-Length: 450\n",
@@ skipping 34 matching lines @@
         new net::HttpResponseHeaders(orig_headers));
 
     std::string name(tests[i].new_status);
     parsed->ReplaceStatusLine(name);
 
     std::string resulting_headers;
     parsed->GetNormalizedHeaders(&resulting_headers);
     EXPECT_EQ(std::string(tests[i].expected_headers), resulting_headers);
   }
 }