| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 int exit_code) override; | 176 int exit_code) override; |
| 177 | 177 |
| 178 // NotificationObserver implementation. | 178 // NotificationObserver implementation. |
| 179 void Observe(int type, | 179 void Observe(int type, |
| 180 const NotificationSource& source, | 180 const NotificationSource& source, |
| 181 const NotificationDetails& details) override; | 181 const NotificationDetails& details) override; |
| 182 | 182 |
| 183 // GpuDataManagerObserver implementation. | 183 // GpuDataManagerObserver implementation. |
| 184 void OnGpuProcessCrashed(base::TerminationStatus exit_code) override; | 184 void OnGpuProcessCrashed(base::TerminationStatus exit_code) override; |
| 185 | 185 |
| 186 const base::DictionaryValue& accumulated_layout_test_runtime_flags_changes() |
| 187 const { |
| 188 return accumulated_layout_test_runtime_flags_changes_; |
| 189 } |
| 190 |
| 186 private: | 191 private: |
| 187 enum TestPhase { | 192 enum TestPhase { |
| 188 BETWEEN_TESTS, | 193 BETWEEN_TESTS, |
| 189 DURING_TEST, | 194 DURING_TEST, |
| 190 CLEAN_UP | 195 CLEAN_UP |
| 191 }; | 196 }; |
| 192 | 197 |
| 193 static BlinkTestController* instance_; | 198 static BlinkTestController* instance_; |
| 194 | 199 |
| 195 void DiscardMainWindow(); | 200 void DiscardMainWindow(); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 // waiting on the UI thread while layout tests are being ran. | 292 // waiting on the UI thread while layout tests are being ran. |
| 288 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 293 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 289 #endif | 294 #endif |
| 290 | 295 |
| 291 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 296 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
| 292 }; | 297 }; |
| 293 | 298 |
| 294 } // namespace content | 299 } // namespace content |
| 295 | 300 |
| 296 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 301 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| OLD | NEW |