Switch AssembleRawHeaders to taking a StringPiece.

This is just one function, but it has a *ton* of callers, so
lots of things need fixing. While I'm here, switch bare new
to base::MakeRefCounted.

Bug: 820198
Change-Id: I41d6ec2d5c4e2733ba8116d0d2e6e7bd26620ea0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574646
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Eric Roman <eroman@chromium.org>
Commit-Queue: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654950}

chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc

@@ -143,8 +143,8 @@ TEST_F(WebApkIconHasherTest, HTTPError) {
   std::string icon_url = "http://www.google.com/404";
   network::ResourceResponseHead head;
   std::string headers("HTTP/1.1 404 Not Found\nContent-type: text/html\n\n");
-  head.headers = new net::HttpResponseHeaders(
-      net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+  head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(headers));
   head.mime_type = "text/html";
   network::URLLoaderCompletionStatus status;
   status.decoded_body_length = 0;

chrome/browser/autocomplete/search_provider_unittest.cc

@@ -3443,8 +3443,8 @@ TEST_F(SearchProviderTest, TestDeleteMatch) {
 
   network::ResourceResponseHead head;
   std::string headers("HTTP/1.1 500 Owiee\nContent-type: application/json\n\n");
-  head.headers = new net::HttpResponseHeaders(
-      net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+  head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(headers));
   head.mime_type = "application/json";
   test_url_loader_factory_.AddResponse(GURL(kDeleteUrl), head, "",
                                        network::URLLoaderCompletionStatus());

chrome/browser/captive_portal/captive_portal_browsertest.cc

@@ -945,7 +945,7 @@ bool CaptivePortalBrowserTest::OnIntercept(
           kMockHttpsUrl);
       net::HttpResponseInfo info;
       info.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-          net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.length()));
+          net::HttpUtil::AssembleRawHeaders(headers));
       network::ResourceResponseHead response;
       response.headers = info.headers;
       response.headers->GetMimeType(&response.mime_type);

chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc

@@ -433,8 +433,8 @@ IN_PROC_BROWSER_TEST_F(ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest,
         network::ResourceResponseHead head;
         std::string status_line("HTTP/1.1 904 ARC Disabled");
         std::string headers = status_line + "\nContent-type: text/html\n\n";
-        head.headers = new net::HttpResponseHeaders(
-            net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+        head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+            net::HttpUtil::AssembleRawHeaders(headers));
         network::URLLoaderCompletionStatus status;
 
         test_url_loader_factory_.AddResponse(request.url, head, std::string(),

chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_unittest.cc

@@ -384,9 +384,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, MigrateIgnoreOtherProxy) {
 TEST_F(DataReductionProxyChromeSettingsTest, CreateDataBasic) {
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
   std::string raw_headers = "HTTP/1.0 200 OK\n";
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
       &handle, headers.get());
@@ -403,9 +402,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataUsedDataReductionProxy) {
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
   handle.set_proxy_server(net::ProxyServer::FromPacString(kProxyPac));
   std::string raw_headers = "HTTP/1.0 200 OK\n";
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
       &handle, headers.get());
@@ -418,9 +416,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataCachedResponse) {
       "HTTP/1.0 200 OK\n"
       "chrome-proxy: foo\n";
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   handle.set_was_response_cached(true);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
@@ -432,9 +429,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataCachedResponse) {
 TEST_F(DataReductionProxyChromeSettingsTest, CreateHTTPSDataCachedResponse) {
   std::string raw_headers = "HTTP/1.0 200 OK\nchrome-proxy: foo\n";
   content::MockNavigationHandle handle(GURL("https://secure.com"), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   handle.set_was_response_cached(true);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
@@ -449,9 +445,8 @@ TEST_F(DataReductionProxyChromeSettingsTest,
       "HTTP/1.0 200 OK\n"
       "via: 1.1 Chrome-Compression-Proxy\n";
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   handle.set_was_response_cached(true);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
@@ -465,9 +460,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataWithLitePage) {
       "HTTP/1.0 200 OK\n"
       "chrome-proxy-content-transform: lite-page\n";
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
       &handle, headers.get());
@@ -482,9 +476,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataWithLofiPolicyReceived) {
       "HTTP/1.0 200 OK\n"
       "chrome-proxy: page-policies=empty-image\n";
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
       &handle, headers.get());
@@ -499,9 +492,8 @@ TEST_F(DataReductionProxyChromeSettingsTest, CreateDataWithLofiReceived) {
       "HTTP/1.0 200 OK\n"
       "chrome-proxy-content-transform: empty-image\n";
   content::MockNavigationHandle handle(GURL(kUrl), main_rfh());
-  scoped_refptr<net::HttpResponseHeaders> headers =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          raw_headers.c_str(), raw_headers.size()));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(raw_headers));
   handle.set_response_headers(headers);
   auto data = drp_chrome_settings_->CreateDataFromNavigationHandle(
       &handle, headers.get());

chrome/browser/download/notification/download_notification_browsertest.cc

@@ -211,8 +211,8 @@ class SlowDownloadInterceptor {
       headers += base::StringPrintf("Content-Length: %ld\n", content_length);
       head.content_length = content_length;
     }
-    head.headers = new net::HttpResponseHeaders(
-        net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.length()));
+    head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+        net::HttpUtil::AssembleRawHeaders(headers));
     head.headers->GetMimeType(&head.mime_type);
     params->client->OnReceiveResponse(head);
   }

chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

@@ -1709,8 +1709,7 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnHeadersReceivedDelta) {
       "X-Chrome-ID-Consistency-Response: Value6\r\n"
       "\r\n";
   auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-      net::HttpUtil::AssembleRawHeaders(base_headers_string.c_str(),
-                                        base_headers_string.size()));
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   ResponseHeaders new_headers = {
       {"kEy1", "Value1"},  // Unchanged
@@ -1759,8 +1758,7 @@ TEST(ExtensionWebRequestHelpersTest,
       "HTTP/1.0 200 OK\r\n"
       "Key1: Value1\r\n";
   auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-      net::HttpUtil::AssembleRawHeaders(base_headers_string.c_str(),
-                                        base_headers_string.size()));
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   ResponseHeaders new_headers = {
       {"Key1", "Value1"},
@@ -2338,10 +2336,8 @@ TEST(ExtensionWebRequestHelpersTest,
       "Set-Cookie: sessionCookie=removed; Max-Age=INVALID\r\n"
       "Set-Cookie: sessionCookie2=removed\r\n"
       "\r\n";
-  scoped_refptr<net::HttpResponseHeaders> base_headers(
-      new net::HttpResponseHeaders(
-          net::HttpUtil::AssembleRawHeaders(
-              base_headers_string.c_str(), base_headers_string.size())));
+  auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   // Check that we can handle if not touching the response headers.
   {
@@ -2496,10 +2492,8 @@ TEST(ExtensionWebRequestHelpersTest,
     deltas.push_back(std::move(delta));
   }
   deltas.sort(&InDecreasingExtensionInstallationTimeOrder);
-  scoped_refptr<net::HttpResponseHeaders> headers1(
-      new net::HttpResponseHeaders(
-          net::HttpUtil::AssembleRawHeaders(
-              base_headers_string.c_str(), base_headers_string.size())));
+  auto headers1 = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
   scoped_refptr<net::HttpResponseHeaders> new_headers1;
   MergeCookiesInOnHeadersReceivedResponses(GURL(), deltas, headers1.get(),
                                            &new_headers1, &logger);
@@ -2539,10 +2533,8 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
       "Key1: Value1\r\n"
       "Key2: Value2, Foo\r\n"
       "\r\n";
-  scoped_refptr<net::HttpResponseHeaders> base_headers(
-      new net::HttpResponseHeaders(
-        net::HttpUtil::AssembleRawHeaders(
-            base_headers_string, sizeof(base_headers_string))));
+  auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   // Check that we can handle if not touching the response headers.
   {
@@ -2683,10 +2675,8 @@ TEST(ExtensionWebRequestHelpersTest,
       "Key1: Value3\r\n"
       "Key2: Value4\r\n"
       "\r\n";
-  scoped_refptr<net::HttpResponseHeaders> base_headers(
-      new net::HttpResponseHeaders(
-        net::HttpUtil::AssembleRawHeaders(
-            base_headers_string, sizeof(base_headers_string))));
+  auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   {
     EventResponseDelta d1("extid1", base::Time::FromInternalValue(2000));
@@ -2737,9 +2727,8 @@ TEST(ExtensionWebRequestHelpersTest,
   char base_headers_string[] =
       "HTTP/1.0 200 OK\r\n"
       "\r\n";
-  scoped_refptr<net::HttpResponseHeaders> base_headers(
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          base_headers_string, sizeof(base_headers_string))));
+  auto base_headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(base_headers_string));
 
   // No redirect
   {

chrome/browser/extensions/api/web_request/web_request_event_details_unittest.cc

@@ -84,9 +84,8 @@ TEST(WebRequestEventDetailsTest, SetResponseHeaders) {
       "Key1: Value1\r\n"
       "X-Chrome-ID-Consistency-Response: Value2\r\n"
       "\r\n";
-  scoped_refptr<net::HttpResponseHeaders> headers(
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          headers_string, sizeof(headers_string))));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(headers_string));
 
   {
     // Non-Gaia URL.

chrome/browser/media/router/discovery/dial/dial_service.cc

@@ -355,11 +355,10 @@ bool DialServiceImpl::DialSocket::ParseResponse(const std::string& response,
     VLOG(1) << "Headers invalid or empty, ignoring: " << response;
     return false;
   }
-  std::string raw_headers =
-      HttpUtil::AssembleRawHeaders(response.c_str(), headers_end);
+  std::string raw_headers = HttpUtil::AssembleRawHeaders(
+      base::StringPiece(response.c_str(), headers_end));
   VLOG(3) << "raw_headers: " << raw_headers << "\n";
-  scoped_refptr<HttpResponseHeaders> headers =
-      new HttpResponseHeaders(raw_headers);
+  auto headers = base::MakeRefCounted<HttpResponseHeaders>(raw_headers);
 
   std::string device_url_str;
   if (!GetHeader(headers.get(), kSsdpLocationHeader, &device_url_str) ||

chrome/browser/offline_pages/offline_page_request_handler.cc

@@ -689,9 +689,8 @@ void OfflinePageRequestHandler::Redirect(const GURL& redirected_url) {
       net::URLRequestRedirectJob::REDIRECT_302_FOUND,
       redirected_url.spec().c_str());
 
-  fake_headers_for_redirect_ =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          header_string.c_str(), header_string.length()));
+  fake_headers_for_redirect_ = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(header_string));
   DCHECK(fake_headers_for_redirect_->IsRedirect(nullptr));
 
   delegate_->NotifyHeadersComplete(0);

chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc

@@ -48,8 +48,7 @@ class PDFIFrameNavigationThrottleTest : public ChromeRenderViewHostTestHarness {
         "content-type: " +
         mime_type + "\r\n";
     return base::MakeRefCounted<net::HttpResponseHeaders>(
-        net::HttpUtil::AssembleRawHeaders(raw_response_headers.c_str(),
-                                          raw_response_headers.size()));
+        net::HttpUtil::AssembleRawHeaders(raw_response_headers));
   }
 
   content::RenderFrameHost* subframe() { return subframe_; }

chrome/browser/previews/previews_lite_page_redirect_url_loader.cc

@@ -161,11 +161,8 @@ void PreviewsLitePageRedirectURLLoader::StartHandlingRedirectToModifiedRequest(
       net::HTTP_TEMPORARY_REDIRECT,
       modified_resource_request_.url.spec().c_str());
 
-  scoped_refptr<net::HttpResponseHeaders> fake_headers_for_redirect =
-      new net::HttpResponseHeaders(net::HttpUtil::AssembleRawHeaders(
-          header_string.c_str(), header_string.length()));
-
-  response_head_.headers = fake_headers_for_redirect;
+  response_head_.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(header_string));
   response_head_.encoded_data_length = 0;
 
   StartHandlingRedirect(resource_request, std::move(request),

chrome/browser/profile_resetter/profile_resetter_unittest.cc

@@ -767,7 +767,7 @@ TEST_F(ConfigParserTest, ParseConfig) {
   network::ResourceResponseHead head;
   std::string headers("HTTP/1.1 200 OK\nContent-type: text/xml\n\n");
   head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-      net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+      net::HttpUtil::AssembleRawHeaders(headers));
   head.mime_type = "text/xml";
   network::URLLoaderCompletionStatus status;
   status.decoded_body_length = xml_config.size();

chrome/browser/safe_browsing/threat_details_unittest.cc

@@ -375,8 +375,8 @@ class ThreatDetailsTest : public ChromeRenderViewHostTestHarness {
                        const std::string& headers,
                        const std::string& content) {
     network::ResourceResponseHead head;
-    head.headers = new net::HttpResponseHeaders(
-        net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+    head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+        net::HttpUtil::AssembleRawHeaders(headers));
     head.remote_endpoint = net::IPEndPoint(net::IPAddress(1, 2, 3, 4), 80);
     head.mime_type = "text/html";
     network::URLLoaderCompletionStatus status;

chrome/browser/spellchecker/spelling_service_client_unittest.cc

@@ -170,8 +170,8 @@ TEST_P(SpellingServiceClientTest, RequestTextCheck) {
   std::string headers(base::StringPrintf(
       "HTTP/1.1 %d %s\nContent-type: application/json\n\n",
       static_cast<int>(http_status), net::GetHttpReasonPhrase(http_status)));
-  head.headers = new net::HttpResponseHeaders(
-      net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+  head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(headers));
   head.mime_type = "application/json";
 
   network::URLLoaderCompletionStatus status;

chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc

@@ -67,7 +67,7 @@ class PermissionRequestCreatorApiaryTest : public testing::Test {
     network::ResourceResponseHead head;
     std::string headers("HTTP/1.1 200 OK\n\n");
     head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-        net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+        net::HttpUtil::AssembleRawHeaders(headers));
     network::URLLoaderCompletionStatus status(error);
     status.decoded_body_length = response.size();
     test_url_loader_factory_.AddResponse(permission_creator_->GetApiUrl(), head,

chrome/browser/supervised_user/experimental/safe_search_url_reporter_unittest.cc

@@ -56,7 +56,7 @@ class SafeSearchURLReporterTest : public testing::Test {
     network::ResourceResponseHead head;
     std::string headers("HTTP/1.1 200 OK\n\n");
     head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(
-        net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size()));
+        net::HttpUtil::AssembleRawHeaders(headers));
     network::URLLoaderCompletionStatus status(error);
     test_url_loader_factory_.AddResponse(GURL(kSafeSearchReportApiUrl), head,
                                          std::string(), status);

chrome/test/chromedriver/net/websocket.cc

@@ -256,10 +256,9 @@ void WebSocket::OnReadDuringHandshake(const char* data, int len) {
   std::string websocket_accept;
   base::Base64Encode(base::SHA1HashString(sec_key_ + kMagicKey),
                      &websocket_accept);
-  scoped_refptr<net::HttpResponseHeaders> headers(
-      new net::HttpResponseHeaders(
-          net::HttpUtil::AssembleRawHeaders(
-              handshake_response_.data(), headers_end)));
+  auto headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+      net::HttpUtil::AssembleRawHeaders(
+          base::StringPiece(handshake_response_.data(), headers_end)));
   if (headers->response_code() != 101 ||
       !headers->HasHeaderValue("Upgrade", "WebSocket") ||
       !headers->HasHeaderValue("Connection", "Upgrade") ||

components/captive_portal/captive_portal_testing_utils.cc

@@ -6,17 +6,17 @@
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/strings/string_piece.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 namespace {
 
 scoped_refptr<net::HttpResponseHeaders> CreateResponseHeaders(
-    const std::string& response_headers) {
-  std::string raw_headers = net::HttpUtil::AssembleRawHeaders(
-      response_headers.c_str(), static_cast<int>(response_headers.length()));
-  return new net::HttpResponseHeaders(raw_headers);
+    base::StringPiece response_headers) {
+  std::string raw_headers = net::HttpUtil::AssembleRawHeaders(response_headers);
+  return base::MakeRefCounted<net::HttpResponseHeaders>(raw_headers);
 }
 
 }  // namespace