Revert of Plumb activation time to main

cc/test/begin_frame_args_test.cc

 // Copyright 2014 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 "cc/test/begin_frame_args_test.h"
 
 #include <stdint.h>
 
 #include "base/time/time.h"
 #include "cc/output/begin_frame_args.h"
 
 namespace cc {
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
     uint32_t source_id,
     uint64_t sequence_number) {
   return CreateBeginFrameArgsForTesting(location, source_id, sequence_number,
                                         base::TimeTicks::Now());
 }
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
     uint32_t source_id,
     uint64_t sequence_number,
     base::TimeTicks frame_time) {
   return BeginFrameArgs::Create(
-      location, source_id, sequence_number,
-      BeginFrameArgs::kDefaultSourceFrameNumber, frame_time,
+      location, source_id, sequence_number, frame_time,
       frame_time + BeginFrameArgs::DefaultInterval() -
           BeginFrameArgs::DefaultEstimatedParentDrawTime(),
       BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
 }
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
     uint32_t source_id,
     uint64_t sequence_number,
     int64_t frame_time,
     int64_t deadline,
     int64_t interval) {
   return BeginFrameArgs::Create(location, source_id, sequence_number,
-                                BeginFrameArgs::kDefaultSourceFrameNumber,
                                 base::TimeTicks::FromInternalValue(frame_time),
                                 base::TimeTicks::FromInternalValue(deadline),
                                 base::TimeDelta::FromInternalValue(interval),
                                 BeginFrameArgs::NORMAL);
 }
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
     uint32_t source_id,
     uint64_t sequence_number,
     int64_t frame_time,
     int64_t deadline,
     int64_t interval,
     BeginFrameArgs::BeginFrameArgsType type) {
   return BeginFrameArgs::Create(location, source_id, sequence_number,
-                                BeginFrameArgs::kDefaultSourceFrameNumber,
                                 base::TimeTicks::FromInternalValue(frame_time),
                                 base::TimeTicks::FromInternalValue(deadline),
                                 base::TimeDelta::FromInternalValue(interval),
                                 type);
 }
 
 BeginFrameArgs CreateBeginFrameArgsForTesting(
     BeginFrameArgs::CreationLocation location,
     uint32_t source_id,
     uint64_t sequence_number,
     base::SimpleTestTickClock* now_src) {
   base::TimeTicks now = now_src->NowTicks();
   return BeginFrameArgs::Create(
-      location, source_id, sequence_number,
-      BeginFrameArgs::kDefaultSourceFrameNumber, now,
+      location, source_id, sequence_number, now,
       now + BeginFrameArgs::DefaultInterval() -
           BeginFrameArgs::DefaultEstimatedParentDrawTime(),
       BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
 }
 
 bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) {
   return (lhs.type == rhs.type) && (lhs.source_id == rhs.source_id) &&
          (lhs.sequence_number == rhs.sequence_number) &&
          (lhs.frame_time == rhs.frame_time) && (lhs.deadline == rhs.deadline) &&
          (lhs.interval == rhs.interval);
@@ skipping 25 matching lines @@
   return os;
 }
 
 void PrintTo(const BeginFrameAck& ack, ::std::ostream* os) {
   *os << "BeginFrameAck(" << ack.source_id << ", " << ack.sequence_number
       << ", " << ack.latest_confirmed_sequence_number << ", " << ack.has_damage
       << ")";
 }
 
 }  // namespace cc