| Index: cc/surfaces/surface_synchronization_unittest.cc
|
| diff --git a/cc/surfaces/surface_synchronization_unittest.cc b/cc/surfaces/surface_synchronization_unittest.cc
|
| index 6fc69e6ef9dacc424c57f0c65e0d8a4515d3aa99..e0cbd3d77b45714228733cba2e44b8a3420ca92d 100644
|
| --- a/cc/surfaces/surface_synchronization_unittest.cc
|
| +++ b/cc/surfaces/surface_synchronization_unittest.cc
|
| @@ -784,14 +784,12 @@ TEST_F(SurfaceSynchronizationTest,
|
| const ui::LatencyComponentType latency_type1 =
|
| ui::BROWSER_SNAPSHOT_FRAME_NUMBER_COMPONENT;
|
| const int64_t latency_id1 = 234;
|
| - const int64_t latency_sequence_number1 = 5645432;
|
| const ui::LatencyComponentType latency_type2 = ui::TAB_SHOW_COMPONENT;
|
| const int64_t latency_id2 = 31434351;
|
| - const int64_t latency_sequence_number2 = 663788;
|
|
|
| // Submit a frame with latency info
|
| ui::LatencyInfo info;
|
| - info.AddLatencyNumber(latency_type1, latency_id1, latency_sequence_number1);
|
| + info.AddLatencyNumber(latency_type1, latency_id1);
|
|
|
| CompositorFrame frame = MakeCompositorFrame();
|
| frame.metadata.latency_info.push_back(info);
|
| @@ -808,7 +806,7 @@ TEST_F(SurfaceSynchronizationTest,
|
| // Submit another frame with some other latency info and a different
|
| // LocalSurfaceId.
|
| ui::LatencyInfo info2;
|
| - info2.AddLatencyNumber(latency_type2, latency_id2, latency_sequence_number2);
|
| + info2.AddLatencyNumber(latency_type2, latency_id2);
|
|
|
| CompositorFrame frame2 = MakeCompositorFrame();
|
| frame2.metadata.latency_info.push_back(info2);
|
| @@ -838,7 +836,6 @@ TEST_F(SurfaceSynchronizationTest,
|
| ui::LatencyInfo::LatencyComponent comp1;
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1));
|
| - EXPECT_EQ(latency_sequence_number1, comp1.sequence_number);
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr));
|
| EXPECT_TRUE(aggregated_latency_info.FindLatency(
|
| @@ -856,14 +853,12 @@ TEST_F(SurfaceSynchronizationTest,
|
| const ui::LatencyComponentType latency_type1 =
|
| ui::BROWSER_SNAPSHOT_FRAME_NUMBER_COMPONENT;
|
| const int64_t latency_id1 = 234;
|
| - const int64_t latency_sequence_number1 = 5645432;
|
| const ui::LatencyComponentType latency_type2 = ui::TAB_SHOW_COMPONENT;
|
| const int64_t latency_id2 = 31434351;
|
| - const int64_t latency_sequence_number2 = 663788;
|
|
|
| // Submit a frame with no unresolved dependecy.
|
| ui::LatencyInfo info;
|
| - info.AddLatencyNumber(latency_type1, latency_id1, latency_sequence_number1);
|
| + info.AddLatencyNumber(latency_type1, latency_id1);
|
|
|
| CompositorFrame frame = MakeCompositorFrame();
|
| frame.metadata.latency_info.push_back(info);
|
| @@ -873,7 +868,7 @@ TEST_F(SurfaceSynchronizationTest,
|
|
|
| // Submit a frame with unresolved dependencies.
|
| ui::LatencyInfo info2;
|
| - info2.AddLatencyNumber(latency_type2, latency_id2, latency_sequence_number2);
|
| + info2.AddLatencyNumber(latency_type2, latency_id2);
|
|
|
| CompositorFrame frame2 = MakeCompositorFrame({child_id}, empty_surface_ids(),
|
| TransferableResourceArray());
|
| @@ -915,7 +910,6 @@ TEST_F(SurfaceSynchronizationTest,
|
| ui::LatencyInfo::LatencyComponent comp1;
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1));
|
| - EXPECT_EQ(latency_sequence_number1, comp1.sequence_number);
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr));
|
| EXPECT_TRUE(aggregated_latency_info.FindLatency(
|
| @@ -933,14 +927,12 @@ TEST_F(SurfaceSynchronizationTest,
|
| const ui::LatencyComponentType latency_type1 =
|
| ui::BROWSER_SNAPSHOT_FRAME_NUMBER_COMPONENT;
|
| const int64_t latency_id1 = 234;
|
| - const int64_t latency_sequence_number1 = 5645432;
|
| const ui::LatencyComponentType latency_type2 = ui::TAB_SHOW_COMPONENT;
|
| const int64_t latency_id2 = 31434351;
|
| - const int64_t latency_sequence_number2 = 663788;
|
|
|
| // Submit a frame with no unresolved dependencies.
|
| ui::LatencyInfo info;
|
| - info.AddLatencyNumber(latency_type1, latency_id1, latency_sequence_number1);
|
| + info.AddLatencyNumber(latency_type1, latency_id1);
|
|
|
| CompositorFrame frame = MakeCompositorFrame();
|
| frame.metadata.latency_info.push_back(info);
|
| @@ -957,7 +949,7 @@ TEST_F(SurfaceSynchronizationTest,
|
| // Submit a frame with a new local surface id and with unresolved
|
| // dependencies.
|
| ui::LatencyInfo info2;
|
| - info2.AddLatencyNumber(latency_type2, latency_id2, latency_sequence_number2);
|
| + info2.AddLatencyNumber(latency_type2, latency_id2);
|
|
|
| CompositorFrame frame2 = MakeCompositorFrame({child_id}, empty_surface_ids(),
|
| TransferableResourceArray());
|
| @@ -995,7 +987,6 @@ TEST_F(SurfaceSynchronizationTest,
|
| ui::LatencyInfo::LatencyComponent comp1;
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type1, latency_id1, &comp1));
|
| - EXPECT_EQ(latency_sequence_number1, comp1.sequence_number);
|
| EXPECT_TRUE(
|
| aggregated_latency_info.FindLatency(latency_type2, latency_id2, nullptr));
|
| EXPECT_TRUE(aggregated_latency_info.FindLatency(
|
|
|