| 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_WEBKIT_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "content/public/renderer/render_view_observer.h" | 10 #include "content/public/renderer/render_view_observer.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 private: | 115 private: |
| 116 // Message handlers. | 116 // Message handlers. |
| 117 void OnSetTestConfiguration( | 117 void OnSetTestConfiguration( |
| 118 const ShellViewMsg_SetTestConfiguration_Params& params); | 118 const ShellViewMsg_SetTestConfiguration_Params& params); |
| 119 | 119 |
| 120 void CaptureDump(); | 120 void CaptureDump(); |
| 121 | 121 |
| 122 static int window_count_; | 122 static int window_count_; |
| 123 | 123 |
| 124 base::FilePath current_working_directory_; | 124 base::FilePath current_working_directory_; |
| 125 base::FilePath temp_path_; |
| 125 | 126 |
| 126 ::WebTestRunner::WebTestProxyBase* proxy_; | 127 ::WebTestRunner::WebTestProxyBase* proxy_; |
| 127 | 128 |
| 128 ::WebTestRunner::WebPreferences prefs_; | 129 ::WebTestRunner::WebPreferences prefs_; |
| 129 | 130 |
| 130 bool enable_pixel_dumping_; | 131 bool enable_pixel_dumping_; |
| 131 int layout_test_timeout_; | 132 int layout_test_timeout_; |
| 132 bool allow_external_pages_; | 133 bool allow_external_pages_; |
| 133 std::string expected_pixel_hash_; | 134 std::string expected_pixel_hash_; |
| 134 | 135 |
| 135 bool is_main_window_; | 136 bool is_main_window_; |
| 136 | 137 |
| 137 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); | 138 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); |
| 138 }; | 139 }; |
| 139 | 140 |
| 140 } // namespace content | 141 } // namespace content |
| 141 | 142 |
| 142 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 143 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| OLD | NEW |