Net: Standardize HttpByteRange printing

content/browser/fileapi/file_system_url_request_job_unittest.cc

Index: content/browser/fileapi/file_system_url_request_job_unittest.cc
diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc
index f414332988eae285158359f76300b0efb03e7164..0e9d6a709a53e61e2d17052aff7a778a22cd5bd0 100644
--- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -26,7 +26,9 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/request_priority.h"
+#include "net/http/http_byte_range.h"
 #include "net/http/http_request_headers.h"
+#include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_test_util.h"
@@ -221,9 +223,8 @@ TEST_F(FileSystemURLRequestJobTest, FileTestFullSpecifiedRange) {
 
   net::HttpRequestHeaders headers;
   headers.SetHeader(net::HttpRequestHeaders::kRange,
-                    base::StringPrintf(
-                         "bytes=%" PRIuS "-%" PRIuS,
-                         first_byte_position, last_byte_position));
+                    net::HttpUtil::PrintRange(net::HttpByteRange::Bounded(
+                        first_byte_position, last_byte_position)));
   TestRequestWithHeaders(CreateFileSystemURL("bigfile"), &headers);
 
   ASSERT_FALSE(request_->is_pending());
@@ -243,9 +244,10 @@ TEST_F(FileSystemURLRequestJobTest, FileTestHalfSpecifiedRange) {
                                     buffer.get() + buffer_size);
 
   net::HttpRequestHeaders headers;
-  headers.SetHeader(net::HttpRequestHeaders::kRange,
-                    base::StringPrintf("bytes=%" PRIuS "-",
-                                       first_byte_position));
+  headers.SetHeader(
+      net::HttpRequestHeaders::kRange,
+      net::HttpUtil::PrintRange(
+          net::HttpByteRange::RightUnbounded(first_byte_position)));
   TestRequestWithHeaders(CreateFileSystemURL("bigfile"), &headers);
   ASSERT_FALSE(request_->is_pending());
   EXPECT_EQ(1, delegate_->response_started_count());
@@ -258,8 +260,14 @@ TEST_F(FileSystemURLRequestJobTest, FileTestHalfSpecifiedRange) {
 TEST_F(FileSystemURLRequestJobTest, FileTestMultipleRangesNotSupported) {
   WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
   net::HttpRequestHeaders headers;
+
+  std::vector<net::HttpByteRange> ranges;
+  ranges.push_back(net::HttpByteRange::Bounded(0, 5));
+  ranges.push_back(net::HttpByteRange::Bounded(10, 200));
+  ranges.push_back(net::HttpByteRange::Bounded(200, 300));
+
   headers.SetHeader(net::HttpRequestHeaders::kRange,
-                    "bytes=0-5,10-200,200-300");
+                    net::HttpUtil::PrintRanges(ranges));
   TestRequestWithHeaders(CreateFileSystemURL("file1.dat"), &headers);
   EXPECT_TRUE(delegate_->request_failed());
   EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE,
@@ -269,7 +277,9 @@ TEST_F(FileSystemURLRequestJobTest, FileTestMultipleRangesNotSupported) {
 TEST_F(FileSystemURLRequestJobTest, RangeOutOfBounds) {
   WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
   net::HttpRequestHeaders headers;
-  headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=500-1000");
+  headers.SetHeader(
+      net::HttpRequestHeaders::kRange,
+      net::HttpUtil::PrintRange(net::HttpByteRange::Bounded(500, 1000)));
   TestRequestWithHeaders(CreateFileSystemURL("file1.dat"), &headers);
 
   ASSERT_FALSE(request_->is_pending());