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

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 empty delegate more explicit, and fix one broken 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 | webkit/appcache/appcache_request_handler_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.h" 10 #include "base/message_loop.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 AndroidStreamReaderURLRequestJobTest() 150 AndroidStreamReaderURLRequestJobTest()
151 : loop_(MessageLoop::TYPE_IO) { 151 : loop_(MessageLoop::TYPE_IO) {
152 } 152 }
153 protected: 153 protected:
154 virtual void SetUp() { 154 virtual void SetUp() {
155 context_.set_job_factory(&factory_); 155 context_.set_job_factory(&factory_);
156 context_.set_network_delegate(&network_delegate_); 156 context_.set_network_delegate(&network_delegate_);
157 req_.reset( 157 req_.reset(
158 new TestURLRequest(GURL("content://foo"), 158 new TestURLRequest(GURL("content://foo"),
159 &url_request_delegate_, 159 &url_request_delegate_,
160 &context_)); 160 &context_,
161 &network_delegate_));
161 req_->set_method("GET"); 162 req_->set_method("GET");
162 } 163 }
163 164
164 void SetRange(net::URLRequest* req, int first_byte, int last_byte) { 165 void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
165 net::HttpRequestHeaders headers; 166 net::HttpRequestHeaders headers;
166 headers.SetHeader(net::HttpRequestHeaders::kRange, 167 headers.SetHeader(net::HttpRequestHeaders::kRange,
167 base::StringPrintf( 168 base::StringPrintf(
168 "bytes=%" PRIuS "-%" PRIuS, 169 "bytes=%" PRIuS "-%" PRIuS,
169 first_byte, last_byte)); 170 first_byte, last_byte));
170 req->SetExtraRequestHeaders(headers); 171 req->SetExtraRequestHeaders(headers);
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 351
351 SetRange(req_.get(), offset, bytes_available); 352 SetRange(req_.get(), offset, bytes_available);
352 req_->Start(); 353 req_->Start();
353 354
354 loop.Run(); 355 loop.Run();
355 356
356 EXPECT_EQ(0, network_delegate_.completed_requests()); 357 EXPECT_EQ(0, network_delegate_.completed_requests());
357 req_->Cancel(); 358 req_->Cancel();
358 EXPECT_EQ(1, network_delegate_.completed_requests()); 359 EXPECT_EQ(1, network_delegate_.completed_requests());
359 } 360 }
OLDNEW
« no previous file with comments | « no previous file | webkit/appcache/appcache_request_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698