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

Side by Side Diff: net/filter/mock_source_stream.cc

Issue 2604233002: Fix bug in deflate code. (Closed)
Patch Set: Revert bypassing replay state Created 3 years, 11 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
« no previous file with comments | « net/filter/mock_source_stream.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "net/filter/mock_source_stream.h" 5 #include "net/filter/mock_source_stream.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/io_buffer.h" 8 #include "net/base/io_buffer.h"
9 #include "testing/gtest/include/gtest/gtest.h"
9 10
10 namespace net { 11 namespace net {
11 12
12 MockSourceStream::MockSourceStream() 13 MockSourceStream::MockSourceStream()
13 : SourceStream(SourceStream::TYPE_NONE), 14 : SourceStream(SourceStream::TYPE_NONE),
15 read_one_byte_at_a_time_(false),
14 awaiting_completion_(false), 16 awaiting_completion_(false),
15 dest_buffer_(nullptr), 17 dest_buffer_(nullptr),
16 dest_buffer_size_(0) {} 18 dest_buffer_size_(0) {}
17 19
18 MockSourceStream::~MockSourceStream() { 20 MockSourceStream::~MockSourceStream() {
19 DCHECK(!awaiting_completion_); 21 DCHECK(!awaiting_completion_);
20 DCHECK(results_.empty()); 22 // All data should have been consumed.
23 EXPECT_TRUE(results_.empty());
21 } 24 }
22 25
23 int MockSourceStream::Read(IOBuffer* dest_buffer, 26 int MockSourceStream::Read(IOBuffer* dest_buffer,
24 int buffer_size, 27 int buffer_size,
25 const CompletionCallback& callback) { 28 const CompletionCallback& callback) {
26 DCHECK(!awaiting_completion_); 29 DCHECK(!awaiting_completion_);
27 DCHECK(!results_.empty()); 30 DCHECK(!results_.empty());
28 31
29 if (results_.empty()) 32 if (results_.empty())
30 return ERR_UNEXPECTED; 33 return ERR_UNEXPECTED;
(...skipping 20 matching lines...) Expand all
51 MockSourceStream::QueuedResult::QueuedResult(const char* data, 54 MockSourceStream::QueuedResult::QueuedResult(const char* data,
52 int len, 55 int len,
53 Error error, 56 Error error,
54 Mode mode) 57 Mode mode)
55 : data(data), len(len), error(error), mode(mode) {} 58 : data(data), len(len), error(error), mode(mode) {}
56 59
57 void MockSourceStream::AddReadResult(const char* data, 60 void MockSourceStream::AddReadResult(const char* data,
58 int len, 61 int len,
59 Error error, 62 Error error,
60 Mode mode) { 63 Mode mode) {
61 // The read result must be between 0 and 32k (inclusive) because the read 64 if (error != OK) {
62 // buffer used in FilterSourceStream is 32k. 65 // Doesn't make any sense to have both an error and data.
63 DCHECK_GE(32 * 1024, len); 66 DCHECK_EQ(len, 0);
64 DCHECK_LE(0, len); 67 } else {
68 // The read result must be between 0 and 32k (inclusive) because the read
69 // buffer used in FilterSourceStream is 32k.
70 DCHECK_GE(32 * 1024, len);
71 DCHECK_LE(0, len);
72 }
73
74 if (len > 0 && read_one_byte_at_a_time_) {
75 for (int i = 0; i < len; ++i) {
76 QueuedResult result(data + i, 1, OK, mode);
77 results_.push(result);
78 }
79 return;
80 }
81
65 QueuedResult result(data, len, error, mode); 82 QueuedResult result(data, len, error, mode);
66 results_.push(result); 83 results_.push(result);
67 } 84 }
68 85
69 void MockSourceStream::CompleteNextRead() { 86 void MockSourceStream::CompleteNextRead() {
70 DCHECK(awaiting_completion_); 87 DCHECK(awaiting_completion_);
71 88
72 awaiting_completion_ = false; 89 awaiting_completion_ = false;
73 QueuedResult r = results_.front(); 90 QueuedResult r = results_.front();
74 DCHECK_EQ(ASYNC, r.mode); 91 DCHECK_EQ(ASYNC, r.mode);
75 results_.pop(); 92 results_.pop();
76 DCHECK_GE(dest_buffer_size_, r.len); 93 DCHECK_GE(dest_buffer_size_, r.len);
77 memcpy(dest_buffer_->data(), r.data, r.len); 94 memcpy(dest_buffer_->data(), r.data, r.len);
78 dest_buffer_ = nullptr; 95 dest_buffer_ = nullptr;
79 callback_.Run(r.error == OK ? r.len : r.error); 96 callback_.Run(r.error == OK ? r.len : r.error);
80 } 97 }
81 98
82 } // namespace net 99 } // namespace net
OLDNEW
« no previous file with comments | « net/filter/mock_source_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698