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

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

Issue 12321106: Update TestURLRequest constructor interface in unit tests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Make use of NULL NetworkDelegate explicit in unit test. Created 7 years, 9 months 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 | net/url_request/url_request.h » ('j') | net/url_request/url_request.h » ('J')
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.h" 10 #include "base/message_loop.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 AndroidStreamReaderURLRequestJobTest() 139 AndroidStreamReaderURLRequestJobTest()
140 : loop_(MessageLoop::TYPE_IO) { 140 : loop_(MessageLoop::TYPE_IO) {
141 } 141 }
142 protected: 142 protected:
143 virtual void SetUp() { 143 virtual void SetUp() {
144 context_.set_job_factory(&factory_); 144 context_.set_job_factory(&factory_);
145 context_.set_network_delegate(&network_delegate_); 145 context_.set_network_delegate(&network_delegate_);
146 req_.reset( 146 req_.reset(
147 new TestURLRequest(GURL("content://foo"), 147 new TestURLRequest(GURL("content://foo"),
148 &url_request_delegate_, 148 &url_request_delegate_,
149 &context_)); 149 &context_,
150 &network_delegate_));
150 req_->set_method("GET"); 151 req_->set_method("GET");
151 } 152 }
152 153
153 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { 154 void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
154 net::HttpRequestHeaders headers; 155 net::HttpRequestHeaders headers;
155 headers.SetHeader(net::HttpRequestHeaders::kRange, 156 headers.SetHeader(net::HttpRequestHeaders::kRange,
156 base::StringPrintf( 157 base::StringPrintf(
157 "bytes=%" PRIuS "-%" PRIuS, 158 "bytes=%" PRIuS "-%" PRIuS,
158 first_byte, last_byte)); 159 first_byte, last_byte));
159 req->SetExtraRequestHeaders(headers); 160 req->SetExtraRequestHeaders(headers);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 312
312 SetRange(req_.get(), offset, bytes_available); 313 SetRange(req_.get(), offset, bytes_available);
313 req_->Start(); 314 req_->Start();
314 315
315 loop.Run(); 316 loop.Run();
316 317
317 EXPECT_EQ(0, network_delegate_.completed_requests()); 318 EXPECT_EQ(0, network_delegate_.completed_requests());
318 req_->Cancel(); 319 req_->Cancel();
319 EXPECT_EQ(1, network_delegate_.completed_requests()); 320 EXPECT_EQ(1, network_delegate_.completed_requests());
320 } 321 }
OLDNEW
« no previous file with comments | « no previous file | net/url_request/url_request.h » ('j') | net/url_request/url_request.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698