| 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 CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ | 5 #ifndef CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ |
| 6 #define CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ | 6 #define CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Saves the states of |test_fixture| and |test_name| for calling | 146 // Saves the states of |test_fixture| and |test_name| for calling |
| 147 // PreloadJavascriptLibraries(). | 147 // PreloadJavascriptLibraries(). |
| 148 std::string preload_test_fixture_; | 148 std::string preload_test_fixture_; |
| 149 std::string preload_test_name_; | 149 std::string preload_test_name_; |
| 150 | 150 |
| 151 // When this is non-NULL, this is The WebUI instance used for testing. | 151 // When this is non-NULL, this is The WebUI instance used for testing. |
| 152 // Otherwise the selected tab's web_ui is used. | 152 // Otherwise the selected tab's web_ui is used. |
| 153 content::WebUI* override_selected_web_ui_; | 153 content::WebUI* override_selected_web_ui_; |
| 154 | 154 |
| 155 std::unique_ptr<TestChromeWebUIControllerFactory> test_factory_; | 155 std::unique_ptr<TestChromeWebUIControllerFactory> test_factory_; |
| 156 |
| 157 logging::ScopedLogMessageListener log_listener_; |
| 156 }; | 158 }; |
| 157 | 159 |
| 158 #endif // CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ | 160 #endif // CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ |
| OLD | NEW |