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

Side by Side Diff: util/net/http_body_test_util.cc

Issue 1416493006: Change file op |ssize_t|s to FileOperationResult (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: fixes Created 5 years, 1 month 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 | « util/net/http_body_test.cc ('k') | util/net/http_transport_mac.mm » ('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 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "util/net/http_body_test_util.h" 15 #include "util/net/http_body_test_util.h"
16 16
17 #include <stdint.h> 17 #include <stdint.h>
18 18
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "gtest/gtest.h" 20 #include "gtest/gtest.h"
21 #include "util/file/file_io.h"
21 #include "util/net/http_body.h" 22 #include "util/net/http_body.h"
22 23
23 namespace crashpad { 24 namespace crashpad {
24 namespace test { 25 namespace test {
25 26
26 std::string ReadStreamToString(HTTPBodyStream* stream) { 27 std::string ReadStreamToString(HTTPBodyStream* stream) {
27 return ReadStreamToString(stream, 32); 28 return ReadStreamToString(stream, 32);
28 } 29 }
29 30
30 std::string ReadStreamToString(HTTPBodyStream* stream, size_t buffer_size) { 31 std::string ReadStreamToString(HTTPBodyStream* stream, size_t buffer_size) {
31 scoped_ptr<uint8_t[]> buf(new uint8_t[buffer_size]); 32 scoped_ptr<uint8_t[]> buf(new uint8_t[buffer_size]);
32 std::string result; 33 std::string result;
33 34
34 ssize_t bytes_read; 35 FileOperationResult bytes_read;
35 while ((bytes_read = stream->GetBytesBuffer(buf.get(), buffer_size)) != 0) { 36 while ((bytes_read = stream->GetBytesBuffer(buf.get(), buffer_size)) != 0) {
36 if (bytes_read < 0) { 37 if (bytes_read < 0) {
37 ADD_FAILURE() << "Failed to read from stream: " << bytes_read; 38 ADD_FAILURE() << "Failed to read from stream: " << bytes_read;
38 return std::string(); 39 return std::string();
39 } 40 }
40 41
41 result.append(reinterpret_cast<char*>(buf.get()), bytes_read); 42 result.append(reinterpret_cast<char*>(buf.get()), bytes_read);
42 } 43 }
43 44
44 return result; 45 return result;
45 } 46 }
46 47
47 } // namespace test 48 } // namespace test
48 } // namespace crashpad 49 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/net/http_body_test.cc ('k') | util/net/http_transport_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698