| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 // next test case. | 162 // next test case. |
| 163 // When reusing an existing RenderView, |for_new_test| should be true, which | 163 // When reusing an existing RenderView, |for_new_test| should be true, which |
| 164 // also resets additional state, like the main frame's name and opener. | 164 // also resets additional state, like the main frame's name and opener. |
| 165 void Reset(bool for_new_test); | 165 void Reset(bool for_new_test); |
| 166 | 166 |
| 167 void set_proxy(test_runner::WebTestProxyBase* proxy) { proxy_ = proxy; } | 167 void set_proxy(test_runner::WebTestProxyBase* proxy) { proxy_ = proxy; } |
| 168 test_runner::WebTestProxyBase* proxy() const { return proxy_; } | 168 test_runner::WebTestProxyBase* proxy() const { return proxy_; } |
| 169 | 169 |
| 170 void ReportLeakDetectionResult(const LeakDetectionResult& result); | 170 void ReportLeakDetectionResult(const LeakDetectionResult& result); |
| 171 | 171 |
| 172 // Message handlers forwarded by LayoutTestRenderFrameObserver. |
| 173 void OnSetTestConfiguration(const ShellTestConfiguration& params); |
| 174 void OnReplicateTestConfiguration(const ShellTestConfiguration& params); |
| 175 |
| 172 private: | 176 private: |
| 173 // Message handlers. | 177 // Message handlers. |
| 174 void OnSetTestConfiguration(const ShellTestConfiguration& params); | |
| 175 void OnSessionHistory( | 178 void OnSessionHistory( |
| 176 const std::vector<int>& routing_ids, | 179 const std::vector<int>& routing_ids, |
| 177 const std::vector<std::vector<PageState> >& session_histories, | 180 const std::vector<std::vector<PageState> >& session_histories, |
| 178 const std::vector<unsigned>& current_entry_indexes); | 181 const std::vector<unsigned>& current_entry_indexes); |
| 179 void OnReset(); | 182 void OnReset(); |
| 180 void OnNotifyDone(); | 183 void OnNotifyDone(); |
| 181 void OnTryLeakDetection(); | 184 void OnTryLeakDetection(); |
| 182 void OnReplyBluetoothManualChooserEvents( | 185 void OnReplyBluetoothManualChooserEvents( |
| 183 const std::vector<std::string>& events); | 186 const std::vector<std::string>& events); |
| 184 | 187 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 210 bool focus_on_next_commit_; | 213 bool focus_on_next_commit_; |
| 211 | 214 |
| 212 scoped_ptr<LeakDetector> leak_detector_; | 215 scoped_ptr<LeakDetector> leak_detector_; |
| 213 | 216 |
| 214 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); | 217 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); |
| 215 }; | 218 }; |
| 216 | 219 |
| 217 } // namespace content | 220 } // namespace content |
| 218 | 221 |
| 219 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 222 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| OLD | NEW |