Update from https://crrev.com/305340

cc/scheduler/begin_frame_source_unittest.cc

 // Copyright 2011 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 <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 20 matching lines @@
     ::testing::Expectation exp =                                           \
         EXPECT_CALL((obs), OnBeginFrame(args)).InSequence((obs).sequence); \
     EXPECT_CALL((obs), LastUsedBeginFrameArgs())                           \
         .Times(::testing::AnyNumber())                                     \
         .After(exp)                                                        \
         .WillRepeatedly(::testing::Return(args));                          \
   }
 
 // Macros to send BeginFrameArgs on a FakeBeginFrameSink (and verify resulting
 // observer behaviour).
-#define SEND_BEGIN_FRAME(                                               \
-    args_equal_to, source, frame_time, deadline, interval)              \
+#define SEND_BEGIN_FRAME(args_equal_to, source, frame_time, deadline,   \
+                         interval)                                      \
   {                                                                     \
     BeginFrameArgs old_args = (source).TestLastUsedBeginFrameArgs();    \
     BeginFrameArgs new_args =                                           \
         CreateBeginFrameArgsForTesting(frame_time, deadline, interval); \
-    ASSERT_TRUE(!(old_args == new_args));                               \
+    ASSERT_FALSE(old_args == new_args);                                 \
     (source).TestOnBeginFrame(new_args);                                \
     EXPECT_EQ(args_equal_to, (source).TestLastUsedBeginFrameArgs());    \
   }
 
 // When dropping LastUsedBeginFrameArgs **shouldn't** change.
 #define SEND_BEGIN_FRAME_DROP(source, frame_time, deadline, interval) \
   SEND_BEGIN_FRAME(old_args, source, frame_time, deadline, interval);
 
 // When used LastUsedBeginFrameArgs **should** be updated.
 #define SEND_BEGIN_FRAME_USED(source, frame_time, deadline, interval) \
@@ skipping 429 matching lines @@
     obs_ = make_scoped_ptr(new MockBeginFrameObserver());
     source_->AddObserver(obs_.get());
   }
 
   void TearDown() override { obs_.reset(); }
 };
 
 TEST_F(SyntheticBeginFrameSourceTest,
        SetNeedsBeginFramesCallsOnBeginFrameWithMissedTick) {
   now_src_->SetNowMicroseconds(10010);
-  EXPECT_CALL((*obs_),
-              OnBeginFrame(CreateTypedBeginFrameArgsForTesting(
-                  10000, 20000, 10000, BeginFrameArgs::MISSED)));
+  EXPECT_CALL((*obs_), OnBeginFrame(CreateBeginFrameArgsForTesting(
+                           10000, 20000, 10000, BeginFrameArgs::MISSED)));
   source_->SetNeedsBeginFrames(true);  // Should cause the last tick to be sent
   // No tasks should need to be run for this to occur.
 }
 
 TEST_F(SyntheticBeginFrameSourceTest,
        SetNeedsBeginFramesCallsCausesOnBeginFrame) {
   source_->SetNeedsBeginFrames(true);
   EXPECT_EQ(10000, task_runner_->NextTaskTime().ToInternalValue());
 
   EXPECT_BEGIN_FRAME_USED(*obs_, 10000, 20000, 10000);
@@ skipping 228 matching lines @@
   mux_->SetActiveSource(source2_);
   SEND_BEGIN_FRAME_DROP(*source2_, 750, 1050, 300);
   SEND_BEGIN_FRAME_USED(*source2_, 1050, 1250, 300);
 
   mux_->SetActiveSource(source1_);
   SEND_BEGIN_FRAME_DROP(*source2_, 1100, 1400, 300);
 }
 
 }  // namespace
 }  // namespace cc