Make URLRequestTestJob accept \n terminated header lines.

content/browser/appcache/appcache_update_job_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 60 matching lines @@
     GetMockResponse(request->url().path(), &headers, &body);
     return new net::URLRequestTestJob(
         request, network_delegate, headers, body, true);
   }
 
  private:
   static void GetMockResponse(const std::string& path,
                               std::string* headers,
                               std::string* body) {
     const char ok_headers[] =
-        "HTTP/1.1 200 OK\0"
-        "\0";
+        "HTTP/1.1 200 OK\n"
+        "\n";
     const char error_headers[] =
-        "HTTP/1.1 500 BOO HOO\0"
-        "\0";
+        "HTTP/1.1 500 BOO HOO\n"
+        "\n";
     const char manifest_headers[] =
-        "HTTP/1.1 200 OK\0"
-        "Content-type: text/cache-manifest\0"
-        "\0";
+        "HTTP/1.1 200 OK\n"
+        "Content-type: text/cache-manifest\n"
+        "\n";
     const char not_modified_headers[] =
-        "HTTP/1.1 304 NOT MODIFIED\0"
-        "\0";
+        "HTTP/1.1 304 NOT MODIFIED\n"
+        "\n";
     const char gone_headers[] =
-        "HTTP/1.1 410 GONE\0"
-        "\0";
+        "HTTP/1.1 410 GONE\n"
+        "\n";
     const char not_found_headers[] =
-        "HTTP/1.1 404 NOT FOUND\0"
-        "\0";
+        "HTTP/1.1 404 NOT FOUND\n"
+        "\n";
     const char no_store_headers[] =
-        "HTTP/1.1 200 OK\0"
-        "Cache-Control: no-store\0"
-        "\0";
+        "HTTP/1.1 200 OK\n"
+        "Cache-Control: no-store\n"
+        "\n";
 
     if (path == "/files/missing-mime-manifest") {
       (*headers) = std::string(ok_headers, arraysize(ok_headers));
       (*body) = "CACHE MANIFEST\n";
     } else if (path == "/files/bad-manifest") {
       (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
       (*body) = "BAD CACHE MANIFEST";
     } else if (path == "/files/empty1") {
       (*headers) = std::string(ok_headers, arraysize(ok_headers));
       (*body) = "";
@@ skipping 290 matching lines @@
     }
   }
 
   int GetResponseCode() const override { return response_code_; }
 
  private:
   ~RetryRequestTestJob() override {}
 
   static std::string retry_headers() {
     const char no_retry_after[] =
-        "HTTP/1.1 503 BOO HOO\0"
-        "\0";
+        "HTTP/1.1 503 BOO HOO\n"
+        "\n";
     const char nonzero[] =
-        "HTTP/1.1 503 BOO HOO\0"
-        "Retry-After: 60\0"
-        "\0";
+        "HTTP/1.1 503 BOO HOO\n"
+        "Retry-After: 60\n"
+        "\n";
     const char retry_after_0[] =
-        "HTTP/1.1 503 BOO HOO\0"
-        "Retry-After: 0\0"
-        "\0";
+        "HTTP/1.1 503 BOO HOO\n"
+        "Retry-After: 0\n"
+        "\n";
 
     switch (retry_after_) {
       case NO_RETRY_AFTER:
         return std::string(no_retry_after, arraysize(no_retry_after));
       case NONZERO_RETRY_AFTER:
         return std::string(nonzero, arraysize(nonzero));
       case RETRY_AFTER_0:
       default:
         return std::string(retry_after_0, arraysize(retry_after_0));
     }
   }
 
   static std::string manifest_headers() {
     const char headers[] =
-        "HTTP/1.1 200 OK\0"
-        "Content-type: text/cache-manifest\0"
-        "\0";
+        "HTTP/1.1 200 OK\r\n"
+        "Content-type: text/cache-manifest\r\n"
+        "\r\n";

[mmenke, 2015/10/27 16:49:31]

\n for consistency?

[martijnc, 2015/10/27 21:10:15]

Done.

     return std::string(headers, arraysize(headers));
   }
 
   static std::string data() {
     return std::string("CACHE MANIFEST\r"
         "http://retry\r");  // must be same as kRetryUrl
   }
 
   RetryRequestTestJob(net::URLRequest* request,
                       net::NetworkDelegate* network_delegate,
@@ skipping 3271 matching lines @@
 
 TEST_F(AppCacheUpdateJobTest, CrossOriginHttpsSuccess) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::CrossOriginHttpsSuccessTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, CrossOriginHttpsDenied) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::CrossOriginHttpsDeniedTest);
 }
 
 }  // namespace content