Net: Standardize HttpByteRange printing

content/browser/fileapi/file_system_url_request_job_unittest.cc

 // Copyright 2013 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 "webkit/browser/fileapi/file_system_url_request_job.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/test/test_file_system_context.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_test_helper.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 
 namespace fileapi {
@@ skipping 174 matching lines @@
   FillBuffer(buffer.get(), buffer_size);
   WriteFile("bigfile", buffer.get(), buffer_size);
 
   const size_t first_byte_position = 500;
   const size_t last_byte_position = buffer_size - first_byte_position;
   std::string partial_buffer_string(buffer.get() + first_byte_position,
                                     buffer.get() + last_byte_position + 1);
 
   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());
   EXPECT_EQ(1, delegate_->response_started_count());
   EXPECT_FALSE(delegate_->received_data_before_response());
   EXPECT_TRUE(partial_buffer_string == delegate_->data_received());
 }
 
 TEST_F(FileSystemURLRequestJobTest, FileTestHalfSpecifiedRange) {
   const size_t buffer_size = 4000;
   scoped_ptr<char[]> buffer(new char[buffer_size]);
   FillBuffer(buffer.get(), buffer_size);
   WriteFile("bigfile", buffer.get(), buffer_size);
 
   const size_t first_byte_position = 500;
   std::string partial_buffer_string(buffer.get() + first_byte_position,
                                     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());
   EXPECT_FALSE(delegate_->received_data_before_response());
   // Don't use EXPECT_EQ, it will print out a lot of garbage if check failed.
   EXPECT_TRUE(partial_buffer_string == delegate_->data_received());
 }
 
 
 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,
             request_->status().error());
 }
 
 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());
   EXPECT_TRUE(delegate_->request_failed());
   EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE,
             request_->status().error());
 }
 
 TEST_F(FileSystemURLRequestJobTest, FileDirRedirect) {
   CreateDirectory("dir");
@@ skipping 73 matching lines @@
 
   // Make sure it returns success with regular (non-incognito) context.
   TestRequest(CreateFileSystemURL("file"));
   ASSERT_FALSE(request_->is_pending());
   EXPECT_EQ(kTestFileData, delegate_->data_received());
   EXPECT_EQ(200, request_->GetResponseCode());
 }
 
 }  // namespace
 }  // namespace fileapi