OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <memory> | 9 #include <memory> |
10 #include <ostream> | 10 #include <ostream> |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 int exit_code) override; | 173 int exit_code) override; |
174 | 174 |
175 // NotificationObserver implementation. | 175 // NotificationObserver implementation. |
176 void Observe(int type, | 176 void Observe(int type, |
177 const NotificationSource& source, | 177 const NotificationSource& source, |
178 const NotificationDetails& details) override; | 178 const NotificationDetails& details) override; |
179 | 179 |
180 // GpuDataManagerObserver implementation. | 180 // GpuDataManagerObserver implementation. |
181 void OnGpuProcessCrashed(base::TerminationStatus exit_code) override; | 181 void OnGpuProcessCrashed(base::TerminationStatus exit_code) override; |
182 | 182 |
| 183 const base::DictionaryValue& accumulated_layout_test_runtime_flags_changes() |
| 184 const { |
| 185 return accumulated_layout_test_runtime_flags_changes_; |
| 186 } |
| 187 |
183 private: | 188 private: |
184 enum TestPhase { | 189 enum TestPhase { |
185 BETWEEN_TESTS, | 190 BETWEEN_TESTS, |
186 DURING_TEST, | 191 DURING_TEST, |
187 CLEAN_UP | 192 CLEAN_UP |
188 }; | 193 }; |
189 | 194 |
190 static BlinkTestController* instance_; | 195 static BlinkTestController* instance_; |
191 | 196 |
192 void DiscardMainWindow(); | 197 void DiscardMainWindow(); |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 // waiting on the UI thread while layout tests are being ran. | 294 // waiting on the UI thread while layout tests are being ran. |
290 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 295 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
291 #endif | 296 #endif |
292 | 297 |
293 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 298 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
294 }; | 299 }; |
295 | 300 |
296 } // namespace content | 301 } // namespace content |
297 | 302 |
298 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 303 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
OLD | NEW |