| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 std::unique_ptr<base::RunLoop> runner_; | 138 std::unique_ptr<base::RunLoop> runner_; |
| 139 base::Value trace_data_; | 139 base::Value trace_data_; |
| 140 | 140 |
| 141 DISALLOW_COPY_AND_ASSIGN(MouseLatencyBrowserTest); | 141 DISALLOW_COPY_AND_ASSIGN(MouseLatencyBrowserTest); |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 // Ensures that LatencyInfo async slices are reported correctly for MouseUp and | 144 // Ensures that LatencyInfo async slices are reported correctly for MouseUp and |
| 145 // MouseDown events in the case where no swap is generated. | 145 // MouseDown events in the case where no swap is generated. |
| 146 // Disabled on Android because we don't support synthetic mouse input on | 146 // Disabled on Android because we don't support synthetic mouse input on |
| 147 // Android (crbug.com/723618). | 147 // Android (crbug.com/723618). |
| 148 #if defined(OS_ANDROID) | 148 // Test is flaky on Linux (crbug.com/736836). |
| 149 #if defined (OS_ANDROID) || defined(OS_LINUX) |
| 149 #define MAYBE_MouseDownAndUpRecordedWithoutSwap \ | 150 #define MAYBE_MouseDownAndUpRecordedWithoutSwap \ |
| 150 DISABLED_MouseDownAndUpRecordedWithoutSwap | 151 DISABLED_MouseDownAndUpRecordedWithoutSwap |
| 151 #else | 152 #else |
| 152 #define MAYBE_MouseDownAndUpRecordedWithoutSwap \ | 153 #define MAYBE_MouseDownAndUpRecordedWithoutSwap \ |
| 153 MouseDownAndUpRecordedWithoutSwap | 154 MouseDownAndUpRecordedWithoutSwap |
| 154 #endif | 155 #endif |
| 155 IN_PROC_BROWSER_TEST_F(MouseLatencyBrowserTest, | 156 IN_PROC_BROWSER_TEST_F(MouseLatencyBrowserTest, |
| 156 MAYBE_MouseDownAndUpRecordedWithoutSwap) { | 157 MAYBE_MouseDownAndUpRecordedWithoutSwap) { |
| 157 LoadURL(); | 158 LoadURL(); |
| 158 | 159 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 182 } | 183 } |
| 183 | 184 |
| 184 // We see two events per async slice, a begin and an end. | 185 // We see two events per async slice, a begin and an end. |
| 185 EXPECT_THAT( | 186 EXPECT_THAT( |
| 186 trace_event_names, | 187 trace_event_names, |
| 187 testing::ElementsAre("InputLatency::MouseDown", "InputLatency::MouseDown", | 188 testing::ElementsAre("InputLatency::MouseDown", "InputLatency::MouseDown", |
| 188 "InputLatency::MouseUp", "InputLatency::MouseUp")); | 189 "InputLatency::MouseUp", "InputLatency::MouseUp")); |
| 189 } | 190 } |
| 190 | 191 |
| 191 } // namespace content | 192 } // namespace content |
| OLD | NEW |