Update from https://crrev.com/305340

cc/output/begin_frame_args_unittest.cc

Index: cc/output/begin_frame_args_unittest.cc
diff --git a/cc/output/begin_frame_args_unittest.cc b/cc/output/begin_frame_args_unittest.cc
index e0c8b3efd34bea4dffbd2a0fb7ed9f1c21677a0c..9d77a45dca1c309eda0cacb0f936b7964a960549 100644
--- a/cc/output/begin_frame_args_unittest.cc
+++ b/cc/output/begin_frame_args_unittest.cc
@@ -26,15 +26,29 @@ TEST(BeginFrameArgsTest, Helpers) {
   EXPECT_EQ(1, args2.frame_time.ToInternalValue());
   EXPECT_EQ(2, args2.deadline.ToInternalValue());
   EXPECT_EQ(3, args2.interval.ToInternalValue());
+  EXPECT_EQ(BeginFrameArgs::NORMAL, args2.type);
 
   BeginFrameArgs args3 = CreateExpiredBeginFrameArgsForTesting();
   EXPECT_TRUE(args3.IsValid()) << args3;
   EXPECT_GT(gfx::FrameTime::Now(), args3.deadline);
+  EXPECT_EQ(BeginFrameArgs::NORMAL, args3.type);
+
+  BeginFrameArgs args4 =
+      CreateBeginFrameArgsForTesting(1, 2, 3, BeginFrameArgs::MISSED);
+  EXPECT_TRUE(args4.IsValid()) << args4;
+  EXPECT_EQ(1, args4.frame_time.ToInternalValue());
+  EXPECT_EQ(2, args4.deadline.ToInternalValue());
+  EXPECT_EQ(3, args4.interval.ToInternalValue());
+  EXPECT_EQ(BeginFrameArgs::MISSED, args4.type);
 
   // operator==
   EXPECT_EQ(CreateBeginFrameArgsForTesting(4, 5, 6),
             CreateBeginFrameArgsForTesting(4, 5, 6));
 
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_EQ(CreateBeginFrameArgsForTesting(7, 8, 9, BeginFrameArgs::MISSED),
+                CreateBeginFrameArgsForTesting(7, 8, 9)),
+      "");
   EXPECT_NONFATAL_FAILURE(EXPECT_EQ(CreateBeginFrameArgsForTesting(4, 5, 6),
                                     CreateBeginFrameArgsForTesting(7, 8, 9)),
                           "");
@@ -42,15 +56,15 @@ TEST(BeginFrameArgsTest, Helpers) {
   // operator<<
   std::stringstream out1;
   out1 << args1;
-  EXPECT_EQ("BeginFrameArgs(0, 0, -1us)", out1.str());
+  EXPECT_EQ("BeginFrameArgs(NORMAL, 0, 0, -1us)", out1.str());
   std::stringstream out2;
   out2 << args2;
-  EXPECT_EQ("BeginFrameArgs(1, 2, 3us)", out2.str());
+  EXPECT_EQ("BeginFrameArgs(NORMAL, 1, 2, 3us)", out2.str());
 
   // PrintTo
-  EXPECT_EQ(std::string("BeginFrameArgs(0, 0, -1us)"),
+  EXPECT_EQ(std::string("BeginFrameArgs(NORMAL, 0, 0, -1us)"),
             ::testing::PrintToString(args1));
-  EXPECT_EQ(std::string("BeginFrameArgs(1, 2, 3us)"),
+  EXPECT_EQ(std::string("BeginFrameArgs(NORMAL, 1, 2, 3us)"),
             ::testing::PrintToString(args2));
 }
 
@@ -59,18 +73,15 @@ TEST(BeginFrameArgsTest, Create) {
   BeginFrameArgs args1;
   EXPECT_FALSE(args1.IsValid()) << args1;
 
-  BeginFrameArgs args2 =
-      BeginFrameArgs::Create(base::TimeTicks::FromInternalValue(1),
-                             base::TimeTicks::FromInternalValue(2),
-                             base::TimeDelta::FromInternalValue(3));
+  BeginFrameArgs args2 = BeginFrameArgs::Create(
+      base::TimeTicks::FromInternalValue(1),
+      base::TimeTicks::FromInternalValue(2),
+      base::TimeDelta::FromInternalValue(3), BeginFrameArgs::NORMAL);
   EXPECT_TRUE(args2.IsValid()) << args2;
   EXPECT_EQ(1, args2.frame_time.ToInternalValue()) << args2;
   EXPECT_EQ(2, args2.deadline.ToInternalValue()) << args2;
   EXPECT_EQ(3, args2.interval.ToInternalValue()) << args2;
-
-  base::TimeTicks now = base::TimeTicks::FromInternalValue(1);
-  EXPECT_EQ(CreateBeginFrameArgsForTesting(1, 0, 16666),
-            BeginFrameArgs::CreateForSynchronousCompositor(now));
+  EXPECT_EQ(BeginFrameArgs::NORMAL, args2.type) << args2;
 }
 
 }  // namespace