Update from https://crrev.com/308996

cc/output/begin_frame_args.cc

 // Copyright 2013 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/output/begin_frame_args.h"
 
 #include "base/debug/trace_event_argument.h"
 #include "ui/gfx/frame_time.h"
 
 namespace cc {
 
 const char* BeginFrameArgs::TypeToString(BeginFrameArgsType type) {
   switch (type) {
     case BeginFrameArgs::INVALID:
       return "INVALID";
     case BeginFrameArgs::NORMAL:
       return "NORMAL";
     case BeginFrameArgs::SYNCHRONOUS:
       return "SYNCHRONOUS";
     case BeginFrameArgs::MISSED:
       return "MISSED";
+    case BeginFrameArgs::BEGIN_FRAME_ARGS_TYPE_MAX:
+      return "BEGIN_FRAME_ARGS_TYPE_MAX";
   }
   NOTREACHED();
   return "???";
 }
 
 BeginFrameArgs::BeginFrameArgs()
     : frame_time(base::TimeTicks()),
       deadline(base::TimeTicks()),
       interval(base::TimeDelta::FromMicroseconds(-1)),
       type(BeginFrameArgs::INVALID) {
 }
 
 BeginFrameArgs::BeginFrameArgs(base::TimeTicks frame_time,
                                base::TimeTicks deadline,
                                base::TimeDelta interval,
                                BeginFrameArgs::BeginFrameArgsType type)
     : frame_time(frame_time),
       deadline(deadline),
       interval(interval),
       type(type) {
 }
 
 BeginFrameArgs BeginFrameArgs::Create(BeginFrameArgs::CreationLocation location,
                                       base::TimeTicks frame_time,
                                       base::TimeTicks deadline,
                                       base::TimeDelta interval,
                                       BeginFrameArgs::BeginFrameArgsType type) {
   DCHECK_NE(type, BeginFrameArgs::INVALID);
+  DCHECK_NE(type, BeginFrameArgs::BEGIN_FRAME_ARGS_TYPE_MAX);
 #ifdef NDEBUG
   return BeginFrameArgs(frame_time, deadline, interval, type);
 #else
   BeginFrameArgs args = BeginFrameArgs(frame_time, deadline, interval, type);
   args.created_from = location;
   return args;
 #endif
 }
 
 scoped_refptr<base::debug::ConvertableToTraceFormat> BeginFrameArgs::AsValue()
@@ skipping 27 matching lines @@
 
 base::TimeDelta BeginFrameArgs::DefaultInterval() {
   return base::TimeDelta::FromMicroseconds(16666);
 }
 
 base::TimeDelta BeginFrameArgs::DefaultRetroactiveBeginFramePeriod() {
   return base::TimeDelta::FromMicroseconds(4444);
 }
 
 }  // namespace cc