diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 07:18:35 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 07:18:35 +0000 |
| commit | c2791c1a3c2c64c7fcd1ca7f4e38b716faf7a268 (patch) | |
| tree | bf9deb604254f9f91fbcaeb3a08b141f6d595d37 /content/public/test/browser_test_utils.h | |
| parent | d2ac8521cb84b1d0c2a1d365a64aac46ddb023af (diff) | |
| download | chromium_src-c2791c1a3c2c64c7fcd1ca7f4e38b716faf7a268.zip chromium_src-c2791c1a3c2c64c7fcd1ca7f4e38b716faf7a268.tar.gz chromium_src-c2791c1a3c2c64c7fcd1ca7f4e38b716faf7a268.tar.bz2 | |
Move webui_resources_test.js to ui/webui/resources/js/.
Doing so permits using the same testing framework for both chrome/ and content/.
In addition:
* Test files no longer need to manually include webui_resources_test.js as it is injected by the test runner
* Common WebUI test runner code was refactored into ExecuteWebUIResourceTest()
* Media WebUI tests were moved from content/browser/resources/media/ to content/test/data/media/webui/ so they get included when running swarm/android tests
Review URL: https://chromiumcodereview.appspot.com/22003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/test/browser_test_utils.h')
| -rw-r--r-- | content/public/test/browser_test_utils.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index ece2805..4dce33e 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h @@ -147,6 +147,13 @@ bool ExecuteScriptAndExtractString(const internal::ToRenderViewHost& adapter, const std::string& script, std::string* result) WARN_UNUSED_RESULT; +// Executes the WebUI resource test runner injecting each resource ID in +// |js_resource_ids| prior to executing the tests. +// +// Returns true if tests ran successfully, false otherwise. +bool ExecuteWebUIResourceTest(const internal::ToRenderViewHost& adapter, + const std::vector<int>& js_resource_ids); + // Returns the cookies for the given url. std::string GetCookies(BrowserContext* browser_context, const GURL& url); |