Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(784)

Unified Diff: chrome/test/base/web_ui_browsertest.h

Issue 292313004: Port aria_util_test.js to run as a WebUI test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.cc ('k') | chrome/test/base/web_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3f35b56360f0ed363550cec68cece73282e93c81 100644
--- a/chrome/test/base/web_ui_browsertest.h
+++ b/chrome/test/base/web_ui_browsertest.h
@@ -137,8 +137,8 @@ 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);
// Builds a string with a call to the runTest JS function, passing the
// given |is_async|, |test_name| and its |args|.
@@ -166,15 +166,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_;
@@ -184,6 +175,12 @@ class WebUIBrowserTest : public InProcessBrowserTest {
std::string preload_test_fixture_;
std::string preload_test_name_;
+ // User added libraries.
+ std::vector<base::FilePath> user_libraries_;
+
+ // User library search paths.
+ std::vector<base::FilePath> library_search_paths_;
+
// When this is non-NULL, this is The WebUI instance used for testing.
// Otherwise the selected tab's web_ui is used.
content::WebUI* override_selected_web_ui_;
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.cc ('k') | chrome/test/base/web_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698