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_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
7 | 7 |
8 #include <ostream> | 8 #include <ostream> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 const base::FilePath& current_working_directory, | 87 const base::FilePath& current_working_directory, |
88 bool enable_pixel_dumping, | 88 bool enable_pixel_dumping, |
89 const std::string& expected_pixel_hash); | 89 const std::string& expected_pixel_hash); |
90 // True if the controller was reset successfully. | 90 // True if the controller was reset successfully. |
91 bool ResetAfterLayoutTest(); | 91 bool ResetAfterLayoutTest(); |
92 | 92 |
93 void SetTempPath(const base::FilePath& temp_path); | 93 void SetTempPath(const base::FilePath& temp_path); |
94 void RendererUnresponsive(); | 94 void RendererUnresponsive(); |
95 void OverrideWebkitPrefs(webkit_glue::WebPreferences* prefs); | 95 void OverrideWebkitPrefs(webkit_glue::WebPreferences* prefs); |
96 void OpenURL(const GURL& url); | 96 void OpenURL(const GURL& url); |
| 97 void TestFinishedInSecondaryWindow(); |
97 | 98 |
98 WebKitTestResultPrinter* printer() { return printer_.get(); } | 99 WebKitTestResultPrinter* printer() { return printer_.get(); } |
99 void set_printer(WebKitTestResultPrinter* printer) { | 100 void set_printer(WebKitTestResultPrinter* printer) { |
100 printer_.reset(printer); | 101 printer_.reset(printer); |
101 } | 102 } |
102 | 103 |
103 // WebContentsObserver implementation. | 104 // WebContentsObserver implementation. |
104 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 105 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
105 virtual void PluginCrashed(const base::FilePath& plugin_path, | 106 virtual void PluginCrashed(const base::FilePath& plugin_path, |
106 base::ProcessId plugin_pid) OVERRIDE; | 107 base::ProcessId plugin_pid) OVERRIDE; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 base::CancelableClosure watchdog_; | 174 base::CancelableClosure watchdog_; |
174 | 175 |
175 NotificationRegistrar registrar_; | 176 NotificationRegistrar registrar_; |
176 | 177 |
177 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 178 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
178 }; | 179 }; |
179 | 180 |
180 } // namespace content | 181 } // namespace content |
181 | 182 |
182 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 183 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
OLD | NEW |