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

Unified Diff: components/tracing/test/fake_scattered_buffer.cc

Issue 2240043004: Tracing V2: Fully-functional plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: components/tracing/test/fake_scattered_buffer.cc
diff --git a/components/tracing/test/fake_scattered_buffer.cc b/components/tracing/test/fake_scattered_buffer.cc
index 18e16e73f9cc8dccddcb3244404bed036630e096..217bf1815ea79817c65c0a51d259e9cff961c570 100644
--- a/components/tracing/test/fake_scattered_buffer.cc
+++ b/components/tracing/test/fake_scattered_buffer.cc
@@ -29,19 +29,19 @@ std::string FakeScatteredBuffer::GetChunkAsString(int chunk_index) {
return base::HexEncode(chunks_[chunk_index].get(), chunk_size_);
}
-std::string FakeScatteredBuffer::GetBytesAsString(size_t start, size_t length) {
- std::string hexstr;
- EXPECT_LE(start + length, chunks_.size() * chunk_size_);
- for (size_t pos = start; pos < start + length; ++pos) {
- const size_t chunk_idx = pos / chunk_size_;
- const size_t chunk_off = pos % chunk_size_;
- if (chunk_idx >= chunks_.size()) {
- hexstr += " <OUT OF BOUND @ pos=" + base::SizeTToString(pos) + ">";
- return hexstr;
- }
- hexstr += base::HexEncode(&chunks_[chunk_idx].get()[chunk_off], 1);
+void FakeScatteredBuffer::GetBytes(size_t start, size_t length, uint8_t* buf) {
+ ASSERT_LE(start + length, chunks_.size() * chunk_size_);
+ for (size_t pos = 0; pos < length; ++pos) {
+ size_t chunk_index = (start + pos) / chunk_size_;
+ size_t chunk_offset = (start + pos) % chunk_size_;
+ buf[pos] = chunks_[chunk_index].get()[chunk_offset];
}
- return hexstr;
+}
+
+std::string FakeScatteredBuffer::GetBytesAsString(size_t start, size_t length) {
+ std::unique_ptr<uint8_t[]> buffer(new uint8_t[length]);
+ GetBytes(start, length, buffer.get());
+ return base::HexEncode(buffer.get(), length);
}
} // namespace v2
« no previous file with comments | « components/tracing/test/fake_scattered_buffer.h ('k') | components/tracing/test/proto_zero_generation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698