small formatting fixes and cleanup

Author: farchond

ci/licenses_golden/licenses_flutter

@@ -1360,6 +1360,7 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_unittest.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/session_connection.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.cc

shell/platform/fuchsia/flutter/BUILD.gn

@@ -454,10 +454,10 @@ executable("flutter_runner_unittests") {
     "platform_view_unittest.cc",
     "runner_unittest.cc",
     "tests/engine_unittests.cc",
+    "tests/fake_session_connection.h",
     "tests/flutter_runner_product_configuration_unittests.cc",
     "tests/vsync_recorder_unittests.cc",
     "tests/vsync_waiter_unittests.cc",
-    "tests/fake_session_connection.h",
   ]
 
   # This is needed for //third_party/googletest for linking zircon symbols.

shell/platform/fuchsia/flutter/default_session_connection.cc

@@ -80,8 +80,8 @@ DefaultSessionConnection::DefaultSessionConnection(
 DefaultSessionConnection::~DefaultSessionConnection() = default;
 
 void DefaultSessionConnection::Present() {
-  TRACE_EVENT2("gfx", "DefaultSessionConnection::Present", "frames_in_flight",
-               frames_in_flight_, "max_frames_in_flight", kMaxFramesInFlight);
+  TRACE_DURATION("gfx", "DefaultSessionConnection::Present", "frames_in_flight",
+                 frames_in_flight_, "max_frames_in_flight", kMaxFramesInFlight);
 
   TRACE_FLOW_BEGIN("gfx", "DefaultSessionConnection::PresentSession",
                    next_present_session_trace_id_);
@@ -133,7 +133,7 @@ fml::TimePoint DefaultSessionConnection::CalculateNextLatchPoint(
 }
 
 void DefaultSessionConnection::PresentSession() {
-  TRACE_EVENT0("gfx", "DefaultSessionConnection::PresentSession");
+  TRACE_DURATION("gfx", "DefaultSessionConnection::PresentSession");
 
   // If we cannot call Present2() because we have no more Scenic frame budget,
   // then we must wait until the OnFramePresented() event fires so we can
@@ -197,7 +197,7 @@ void DefaultSessionConnection::PresentSession() {
 
 void DefaultSessionConnection::InitializeVsyncWaiterCallback(
     VsyncWaiterCallback callback) {
-  FML_CHECK(!vsync_waiter_initialized_);
+  FML_DCHECK(!vsync_waiter_initialized_);
 
   vsync_waiter_callback_ = callback;
   vsync_waiter_initialized_ = true;

shell/platform/fuchsia/flutter/default_session_connection.h

@@ -27,6 +27,15 @@ class DefaultSessionConnection final
     : public flutter::SessionWrapper,
       public flutter_runner::SessionConnection {
  public:
+  static fml::TimePoint CalculateNextLatchPoint(
+      fml::TimePoint present_requested_time,
+      fml::TimePoint now,
+      fml::TimePoint last_latch_point_targeted,
+      fml::TimeDelta flutter_frame_build_time,
+      fml::TimeDelta vsync_interval,
+      std::deque<std::pair<fml::TimePoint, fml::TimePoint>>&
+          future_presentation_infos);
+
   DefaultSessionConnection(
       std::string debug_label,
       fidl::InterfaceHandle<fuchsia::ui::scenic::Session> session,
@@ -36,20 +45,16 @@ class DefaultSessionConnection final
 
   ~DefaultSessionConnection();
 
+  // |SessionWrapper|
   scenic::Session* get() override { return &session_wrapper_; }
-  void Present() override;
 
-  static fml::TimePoint CalculateNextLatchPoint(
-      fml::TimePoint present_requested_time,
-      fml::TimePoint now,
-      fml::TimePoint last_latch_point_targeted,
-      fml::TimeDelta flutter_frame_build_time,
-      fml::TimeDelta vsync_interval,
-      std::deque<std::pair<fml::TimePoint, fml::TimePoint>>&
-          future_presentation_infos);
+  // |SessionWrapper|
+  void Present() override;
 
+  // |SessionConnection|
   void InitializeVsyncWaiterCallback(VsyncWaiterCallback callback) override;
 
+  // |SessionConnection|
   bool CanRequestNewFrames() override {
     return frames_in_flight_ < kMaxFramesInFlight;
   }

shell/platform/fuchsia/flutter/engine.cc

@@ -135,7 +135,6 @@ Engine::Engine(Delegate& delegate,
        view_ref_pair = std::move(view_ref_pair),
        max_frames_in_flight = product_config.get_max_frames_in_flight(),
        &view_embedder_latch]() mutable {
-        FML_LOG(INFO) << "FELIPE: made shared";
         session_connection_ = std::make_shared<DefaultSessionConnection>(
             thread_label_, std::move(session),
             std::move(session_error_callback), [](auto) {},

shell/platform/fuchsia/flutter/tests/fake_session_connection.h

@@ -20,9 +20,9 @@ class FakeSessionConnection : public flutter_runner::SessionConnection {
 
   bool CanRequestNewFrames() override { return can_request_new_frames_; }
 
-  void FireVsyncWaiterCallbackForTest() { callback_(); }
+  void FireVsyncWaiterCallback() { callback_(); }
 
-  void SetCanRequestNewFramesForTest(bool new_bool) {
+  void SetCanRequestNewFrames(bool new_bool) {
     can_request_new_frames_ = new_bool;
   }
 

shell/platform/fuchsia/flutter/tests/vsync_waiter_unittests.cc

@@ -82,7 +82,7 @@ TEST_F(VsyncWaiterTest, SimpleVsyncCallback) {
   bool flag = false;
   vsync_waiter->AsyncWaitForVsync([&flag](auto) { flag = true; });
 
-  session_connection->FireVsyncWaiterCallbackForTest();
+  session_connection->FireVsyncWaiterCallback();
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
@@ -93,7 +93,7 @@ TEST_F(VsyncWaiterTest, EnsureBackPressure) {
   auto vsync_waiter = get_vsync_waiter();
   auto session_connection = get_session_connection();
 
-  session_connection->SetCanRequestNewFramesForTest(false);
+  session_connection->SetCanRequestNewFrames(false);
   bool flag = false;
   vsync_waiter->AsyncWaitForVsync([&flag](auto) { flag = true; });
 
@@ -106,16 +106,16 @@ TEST_F(VsyncWaiterTest, BackPressureRelief) {
   auto vsync_waiter = get_vsync_waiter();
   auto session_connection = get_session_connection();
 
-  session_connection->SetCanRequestNewFramesForTest(false);
+  session_connection->SetCanRequestNewFrames(false);
   bool flag = false;
   vsync_waiter->AsyncWaitForVsync([&flag](auto) { flag = true; });
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   EXPECT_FALSE(flag);
 
-  session_connection->SetCanRequestNewFramesForTest(true);
-  session_connection->FireVsyncWaiterCallbackForTest();
+  session_connection->SetCanRequestNewFrames(true);
+  session_connection->FireVsyncWaiterCallback();
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
@@ -126,7 +126,7 @@ TEST_F(VsyncWaiterTest, SteadyStateBehavior) {
   auto vsync_waiter = get_vsync_waiter();
   auto session_connection = get_session_connection();
 
-  session_connection->SetCanRequestNewFramesForTest(true);
+  session_connection->SetCanRequestNewFrames(true);
 
   int count = 0;
   const int expected_iterations = 100;