Index: net/url_request/url_request_unittest.cc |
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc |
index 7087f890af6709161f7d549d9a47599752f355f8..9ad2858169ed16021d400c2b03d3abafd2e263f2 100644 |
--- a/net/url_request/url_request_unittest.cc |
+++ b/net/url_request/url_request_unittest.cc |
@@ -50,11 +50,13 @@ |
#include "net/disk_cache/disk_cache.h" |
#include "net/dns/mock_host_resolver.h" |
#include "net/ftp/ftp_network_layer.h" |
+#include "net/http/http_byte_range.h" |
#include "net/http/http_cache.h" |
#include "net/http/http_network_layer.h" |
#include "net/http/http_network_session.h" |
#include "net/http/http_request_headers.h" |
#include "net/http/http_response_headers.h" |
+#include "net/http/http_util.h" |
#include "net/ocsp/nss_ocsp.h" |
#include "net/proxy/proxy_service.h" |
#include "net/socket/ssl_client_socket.h" |
@@ -760,9 +762,8 @@ TEST_F(URLRequestTest, FileTestFullSpecifiedRange) { |
HttpRequestHeaders headers; |
headers.SetHeader(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))); |
r.SetExtraRequestHeaders(headers); |
r.Start(); |
EXPECT_TRUE(r.is_pending()); |
@@ -803,9 +804,11 @@ TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) { |
URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); |
HttpRequestHeaders headers; |
- headers.SetHeader(HttpRequestHeaders::kRange, |
- base::StringPrintf("bytes=%" PRIuS "-", |
- first_byte_position)); |
+ |
+ headers.SetHeader( |
+ HttpRequestHeaders::kRange, |
+ net::HttpUtil::PrintRange( |
+ net::HttpByteRange::RightUnbounded(first_byte_position))); |
r.SetExtraRequestHeaders(headers); |
r.Start(); |
EXPECT_TRUE(r.is_pending()); |
@@ -839,9 +842,14 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) { |
{ |
URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); |
+ std::vector<net::HttpByteRange> ranges; |
+ ranges.push_back(net::HttpByteRange::Bounded(0, 0)); |
+ ranges.push_back(net::HttpByteRange::Bounded(10, 200)); |
+ ranges.push_back(net::HttpByteRange::Bounded(200, 300)); |
+ |
HttpRequestHeaders headers; |
headers.SetHeader(HttpRequestHeaders::kRange, |
- "bytes=0-0,10-200,200-300"); |
+ HttpUtil::PrintRanges(ranges)); |
r.SetExtraRequestHeaders(headers); |
r.Start(); |
EXPECT_TRUE(r.is_pending()); |