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