Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Issue 78343004: Net: Standardize HttpByteRange printing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/fileapi/blob_url_request_job_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
14 #include "net/url_request/url_request_job_factory_impl.h" 15 #include "net/url_request/url_request_job_factory_impl.h"
15 #include "net/url_request/url_request_test_util.h" 16 #include "net/url_request/url_request_test_util.h"
16 17
17 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 20
20 using android_webview::InputStream; 21 using android_webview::InputStream;
21 using android_webview::InputStreamReader; 22 using android_webview::InputStreamReader;
22 using net::TestDelegate; 23 using net::TestDelegate;
23 using net::TestJobInterceptor; 24 using net::TestJobInterceptor;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 req_.reset(new TestURLRequest(GURL("content://foo"), 156 req_.reset(new TestURLRequest(GURL("content://foo"),
156 net::DEFAULT_PRIORITY, 157 net::DEFAULT_PRIORITY,
157 &url_request_delegate_, 158 &url_request_delegate_,
158 &context_)); 159 &context_));
159 req_->set_method("GET"); 160 req_->set_method("GET");
160 } 161 }
161 162
162 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { 163 void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
163 net::HttpRequestHeaders headers; 164 net::HttpRequestHeaders headers;
164 headers.SetHeader(net::HttpRequestHeaders::kRange, 165 headers.SetHeader(net::HttpRequestHeaders::kRange,
165 base::StringPrintf( 166 net::HttpByteRange::Bounded(
166 "bytes=%" PRIuS "-%" PRIuS, 167 first_byte, last_byte).GetHeaderValue());
167 first_byte, last_byte));
168 req->SetExtraRequestHeaders(headers); 168 req->SetExtraRequestHeaders(headers);
169 } 169 }
170 170
171 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) { 171 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) {
172 SetUpTestJob(stream_reader.Pass(), 172 SetUpTestJob(stream_reader.Pass(),
173 make_scoped_ptr(new StreamReaderDelegate()) 173 make_scoped_ptr(new StreamReaderDelegate())
174 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); 174 .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
175 } 175 }
176 176
177 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader, 177 void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader,
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 348
349 SetRange(req_.get(), offset, bytes_available); 349 SetRange(req_.get(), offset, bytes_available);
350 req_->Start(); 350 req_->Start();
351 351
352 loop.Run(); 352 loop.Run();
353 353
354 EXPECT_EQ(0, network_delegate_.completed_requests()); 354 EXPECT_EQ(0, network_delegate_.completed_requests());
355 req_->Cancel(); 355 req_->Cancel();
356 EXPECT_EQ(1, network_delegate_.completed_requests()); 356 EXPECT_EQ(1, network_delegate_.completed_requests());
357 } 357 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/fileapi/blob_url_request_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698