Revert of Don't use barcodes in ProtocolPerfTests

remoting/test/cyclic_frame_generator.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 "remoting/test/cyclic_frame_generator.h"
 
 #include "base/time/default_tick_clock.h"
 #include "remoting/test/frame_generator_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
@@ skipping 30 matching lines @@
 CyclicFrameGenerator::~CyclicFrameGenerator() {}
 
 void CyclicFrameGenerator::SetTickClock(base::TickClock* tick_clock) {
   clock_ = tick_clock;
   started_time_ = clock_->NowTicks();
 }
 
 std::unique_ptr<webrtc::DesktopFrame> CyclicFrameGenerator::GenerateFrame(
     webrtc::SharedMemoryFactory* shared_memory_factory) {
   base::TimeTicks now = clock_->NowTicks();
-
   int frame_id = (now - started_time_) / cursor_blink_period_;
   int reference_frame =
       ((now - started_time_) / frame_cycle_period_) % reference_frames_.size();
   bool cursor_state = frame_id % 2;
 
   std::unique_ptr<webrtc::DesktopFrame> frame(
       new webrtc::BasicDesktopFrame(screen_size_));
   frame->CopyPixelsFrom(*reference_frames_[reference_frame],
                         webrtc::DesktopVector(),
                         webrtc::DesktopRect::MakeSize(screen_size_));
@@ skipping 12 matching lines @@
     last_frame_type_ = ChangeType::FULL;
   } else if (last_cursor_state_ != cursor_state) {
     // Cursor state has changed.
     frame->mutable_updated_region()->AddRect(cursor_rect);
     last_frame_type_ = ChangeType::CURSOR;
   } else {
     // No changes.
     last_frame_type_ = ChangeType::NO_CHANGES;
   }
 
+  if (draw_barcode_)
+    DrawBarcode(frame_id, frame_id != last_frame_id_, frame.get());
+
   last_reference_frame_ = reference_frame;
   last_cursor_state_ = cursor_state;
+  last_frame_id_ = frame_id;
 
   return frame;
 }
 
 CyclicFrameGenerator::ChangeInfoList CyclicFrameGenerator::GetChangeList(
-    base::TimeTicks timestamp) {
-  int frame_id = (timestamp - started_time_) / cursor_blink_period_;
+    webrtc::DesktopFrame* frame) {
+  CHECK(draw_barcode_);
+  int frame_id = ReadBarcode(*frame);
   CHECK_GE(frame_id, last_identifier_frame_);
 
   ChangeInfoList result;
   for (int i = last_identifier_frame_ + 1; i <= frame_id; ++i) {
     ChangeType type = (i % (frame_cycle_period_ / cursor_blink_period_) == 0)
                           ? ChangeType::FULL
                           : ChangeType::CURSOR;
     base::TimeTicks timestamp =
         started_time_ + i * base::TimeDelta(cursor_blink_period_);
     result.push_back(ChangeInfo(type, timestamp));
   }
   last_identifier_frame_ = frame_id;
 
   return result;
 }
 
-protocol::InputEventTimestamps CyclicFrameGenerator::TakeLastEventTimestamps() {
-  base::TimeTicks now = clock_->NowTicks();
-  return protocol::InputEventTimestamps{now, now};
-}
-
 }  // namespace test
 }  // namespace remoting