Tracing V2: Trace buffer writer uses proto.

components/tracing/core/trace_buffer_writer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/tracing/core/trace_buffer_writer.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "components/tracing/core/proto_utils.h"
+#include "components/tracing/proto/events_chunk.pbzero.h"
 
 namespace tracing {
 namespace v2 {
 
 namespace {
 
-// TODO(primiano) remove this in next CLs. This should just be taken from the
-// C++ class autogenerated from events_chunk.proto (crbug.com/608721).
-struct ChunkProto {
-  enum : uint32_t {
-    kWriterIdFieldNumber = 1,
-    kSeqIdInStreamFieldNumber = 2,
-    kEventsFieldNumber = 3,
-    kFirstEventContinuesFromPrevChunkFieldNumber = 4,
-    kLastEventContinuesOnNextChunkFieldNumber = 5
-  };
-};
+using ChunkProto = pbzero::tracing::proto::EventsChunk;
 
 const size_t kEventPreambleSize = 1 + proto::kMessageLengthFieldSize;
 
 // TODO(primiano): replace 16 with a more reasonable size, that is, the size
 // of a simple trace event with no args.
 const size_t kMinEventSize = 16;
 
 }  // namespace
 
 TraceBufferWriter::TraceBufferWriter(TraceRingBuffer* trace_ring_buffer,
@@ skipping 116 matching lines @@
   // events_chunk.proto cannot be used here because that would re-enter this
   // class and make this code extremely hard to reason about.
   uint8_t* chunk_proto = new_chunk->payload();
 
   proto::StaticAssertSingleBytePreamble<ChunkProto::kWriterIdFieldNumber>();
   *chunk_proto++ = static_cast<uint8_t>(
       proto::MakeTagVarInt(ChunkProto::kWriterIdFieldNumber));
   chunk_proto = proto::WriteVarInt(writer_id_, chunk_proto);
 
   proto::StaticAssertSingleBytePreamble<
-      ChunkProto::kSeqIdInStreamFieldNumber>();
+      ChunkProto::kSeqIdFieldNumber>();
   *chunk_proto++ = static_cast<uint8_t>(
-      proto::MakeTagVarInt(ChunkProto::kSeqIdInStreamFieldNumber));
+      proto::MakeTagVarInt(ChunkProto::kSeqIdFieldNumber));
   chunk_proto = proto::WriteVarInt(chunk_seq_id_, chunk_proto);
 
   if (is_fragmenting_event) {
     proto::StaticAssertSingleBytePreamble<
         ChunkProto::kFirstEventContinuesFromPrevChunkFieldNumber>();
     *chunk_proto++ = static_cast<uint8_t>(proto::MakeTagVarInt(
         ChunkProto::kFirstEventContinuesFromPrevChunkFieldNumber));
     *chunk_proto++ = 1;  // = true.
   }
 
@@ skipping 28 matching lines @@
 
 void TraceBufferWriter::Flush() {
   FinalizeCurrentEvent();
   FinalizeCurrentChunk(false /* is_fragmenting_event */);
   trace_ring_buffer_->ReturnChunk(chunk_);
   chunk_ = nullptr;
 }
 
 }  // namespace v2
 }  // namespace tracing