OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "android_webview/browser/input_stream.h" | 5 #include "android_webview/browser/input_stream.h" |
6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h" | 6 #include "android_webview/browser/net/android_stream_reader_url_request_job.h" |
7 #include "android_webview/browser/net/aw_url_request_job_factory.h" | 7 #include "android_webview/browser/net/aw_url_request_job_factory.h" |
8 #include "android_webview/browser/net/input_stream_reader.h" | 8 #include "android_webview/browser/net/input_stream_reader.h" |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "net/base/request_priority.h" | 13 #include "net/base/request_priority.h" |
| 14 #include "net/http/http_byte_range.h" |
| 15 #include "net/http/http_util.h" |
14 #include "net/url_request/url_request_job_factory_impl.h" | 16 #include "net/url_request/url_request_job_factory_impl.h" |
15 #include "net/url_request/url_request_test_util.h" | 17 #include "net/url_request/url_request_test_util.h" |
16 | 18 |
17 #include "testing/gmock/include/gmock/gmock.h" | 19 #include "testing/gmock/include/gmock/gmock.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
19 | 21 |
20 using android_webview::InputStream; | 22 using android_webview::InputStream; |
21 using android_webview::InputStreamReader; | 23 using android_webview::InputStreamReader; |
22 using net::TestDelegate; | 24 using net::TestDelegate; |
23 using net::TestJobInterceptor; | 25 using net::TestJobInterceptor; |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 req_.reset(new TestURLRequest(GURL("content://foo"), | 157 req_.reset(new TestURLRequest(GURL("content://foo"), |
156 net::DEFAULT_PRIORITY, | 158 net::DEFAULT_PRIORITY, |
157 &url_request_delegate_, | 159 &url_request_delegate_, |
158 &context_)); | 160 &context_)); |
159 req_->set_method("GET"); | 161 req_->set_method("GET"); |
160 } | 162 } |
161 | 163 |
162 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { | 164 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { |
163 net::HttpRequestHeaders headers; | 165 net::HttpRequestHeaders headers; |
164 headers.SetHeader(net::HttpRequestHeaders::kRange, | 166 headers.SetHeader(net::HttpRequestHeaders::kRange, |
165 base::StringPrintf( | 167 net::HttpUtil::PrintRange( |
166 "bytes=%" PRIuS "-%" PRIuS, | 168 net::HttpByteRange::Bounded(first_byte, last_byte))); |
167 first_byte, last_byte)); | |
168 req->SetExtraRequestHeaders(headers); | 169 req->SetExtraRequestHeaders(headers); |
169 } | 170 } |
170 | 171 |
171 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) { | 172 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) { |
172 SetUpTestJob(stream_reader.Pass(), | 173 SetUpTestJob(stream_reader.Pass(), |
173 make_scoped_ptr(new StreamReaderDelegate()) | 174 make_scoped_ptr(new StreamReaderDelegate()) |
174 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); | 175 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); |
175 } | 176 } |
176 | 177 |
177 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader, | 178 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader, |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 | 349 |
349 SetRange(req_.get(), offset, bytes_available); | 350 SetRange(req_.get(), offset, bytes_available); |
350 req_->Start(); | 351 req_->Start(); |
351 | 352 |
352 loop.Run(); | 353 loop.Run(); |
353 | 354 |
354 EXPECT_EQ(0, network_delegate_.completed_requests()); | 355 EXPECT_EQ(0, network_delegate_.completed_requests()); |
355 req_->Cancel(); | 356 req_->Cancel(); |
356 EXPECT_EQ(1, network_delegate_.completed_requests()); | 357 EXPECT_EQ(1, network_delegate_.completed_requests()); |
357 } | 358 } |
OLD | NEW |