| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 }; | 169 }; |
| 170 | 170 |
| 171 /////////////////////////////////////////////////////////////////////////// | 171 /////////////////////////////////////////////////////////////////////////// |
| 172 // Methods dealing with the test logic | 172 // Methods dealing with the test logic |
| 173 | 173 |
| 174 // By default, tests end when page load is complete. These methods are used | 174 // By default, tests end when page load is complete. These methods are used |
| 175 // to delay the completion of the test until notifyDone is called. | 175 // to delay the completion of the test until notifyDone is called. |
| 176 void NotifyDone(); | 176 void NotifyDone(); |
| 177 void WaitUntilDone(); | 177 void WaitUntilDone(); |
| 178 | 178 |
| 179 // Log to stderr, so the logging doesn't skew the normal test output. |
| 180 void LogToStderr(const std::string& script); |
| 181 |
| 179 // Methods for adding actions to the work queue. Used in conjunction with | 182 // Methods for adding actions to the work queue. Used in conjunction with |
| 180 // waitUntilDone/notifyDone above. | 183 // waitUntilDone/notifyDone above. |
| 181 void QueueBackNavigation(int how_far_back); | 184 void QueueBackNavigation(int how_far_back); |
| 182 void QueueForwardNavigation(int how_far_forward); | 185 void QueueForwardNavigation(int how_far_forward); |
| 183 void QueueReload(); | 186 void QueueReload(); |
| 184 void QueueLoadingScript(const std::string& script); | 187 void QueueLoadingScript(const std::string& script); |
| 185 void QueueNonLoadingScript(const std::string& script); | 188 void QueueNonLoadingScript(const std::string& script); |
| 186 void QueueLoad(const std::string& url, const std::string& target); | 189 void QueueLoad(const std::string& url, const std::string& target); |
| 187 void QueueLoadHTMLString(gin::Arguments* args); | 190 void QueueLoadHTMLString(gin::Arguments* args); |
| 188 | 191 |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 bool use_mock_theme_; | 712 bool use_mock_theme_; |
| 710 | 713 |
| 711 base::WeakPtrFactory<TestRunner> weak_factory_; | 714 base::WeakPtrFactory<TestRunner> weak_factory_; |
| 712 | 715 |
| 713 DISALLOW_COPY_AND_ASSIGN(TestRunner); | 716 DISALLOW_COPY_AND_ASSIGN(TestRunner); |
| 714 }; | 717 }; |
| 715 | 718 |
| 716 } // namespace content | 719 } // namespace content |
| 717 | 720 |
| 718 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ | 721 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ |
| OLD | NEW |