Index: chrome/test/base/web_ui_browsertest.h |
diff --git a/chrome/test/base/web_ui_browsertest.h b/chrome/test/base/web_ui_browsertest.h |
index 3df3a348272c053d262eccc5fae672d1ca7ae679..4fec2a979f0df8bd76d4c1b709c9855a13151e5f 100644 |
--- a/chrome/test/base/web_ui_browsertest.h |
+++ b/chrome/test/base/web_ui_browsertest.h |
@@ -137,8 +137,14 @@ class WebUIBrowserTest : public InProcessBrowserTest { |
static GURL WebUITestDataPathToURL(const base::FilePath::StringType& path); |
private: |
- // Builds a string containing all added javascript libraries. |
- void BuildJavascriptLibraries(base::string16* content); |
+ // Builds a vector of strings of all added javascript libraries. |
+ void BuildJavascriptLibraries(std::vector<base::string16>* libraries); |
+ |
+ // User added libraries. |
+ std::vector<base::FilePath> user_libraries_; |
+ |
+ // User library search paths. |
+ std::vector<base::FilePath> library_search_paths_; |
// Builds a string with a call to the runTest JS function, passing the |
// given |is_async|, |test_name| and its |args|. |
@@ -166,15 +172,6 @@ class WebUIBrowserTest : public InProcessBrowserTest { |
// Handles test framework messages. |
scoped_ptr<WebUITestHandler> test_handler_; |
- // Location of test data (currently test/data/webui). |
- base::FilePath test_data_directory_; |
- |
- // Location of generated test data (<(PROGRAM_DIR)/test_data). |
- base::FilePath gen_test_data_directory_; |
- |
- // User added libraries |
- std::vector<base::FilePath> user_libraries_; |
- |
// Indicates that the libraries have been pre-loaded and to not load them |
// again. |
bool libraries_preloaded_; |