diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 10:41:09 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 10:41:09 +0000 |
| commit | 307b67f190fb18087d1faf550ac941848f3370ff (patch) | |
| tree | 61f5aec40bb44c774f44cdcc247b45d0ace31d7b /content/test/layout_browsertest.cc | |
| parent | 798668da313c13d7ebd35fb376db80544afb237f (diff) | |
| download | chromium_src-307b67f190fb18087d1faf550ac941848f3370ff.zip chromium_src-307b67f190fb18087d1faf550ac941848f3370ff.tar.gz chromium_src-307b67f190fb18087d1faf550ac941848f3370ff.tar.bz2 | |
Rename layoutTestController to testRunner.
I should come up with a better name than LayoutTestController{Host,} for content_shell
The extension docs are updated here: https://chromiumcodereview.appspot.com/10825200/
The binaries in chrome/test/data/extensions/uitest don't actually invoke LTC
BUG=none
TEST=still works after WK roll
Review URL: https://chromiumcodereview.appspot.com/10827182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/layout_browsertest.cc')
| -rw-r--r-- | content/test/layout_browsertest.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index e6607f7..b0fac406 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -67,7 +67,7 @@ void ScrapeResultFromBrowser(content::Shell* window, std::string* actual_text) { static const std::string preamble = "\n<script>\n" - "function LayoutTestController() {\n" + "function TestRunner() {\n" " this.wait_until_done_ = false;\n" " this.dumpAsText = function () {};\n" " this.waitUntilDone = function () {\n" @@ -78,14 +78,13 @@ static const std::string preamble = " }\n" " this.overridePreference = function () {}\n" " this.OnEvent = function () {\n" - " if (!layoutTestController.wait_until_done_)\n" - " layoutTestController.notifyDone();\n" + " if (!testRunner.wait_until_done_)\n" + " testRunner.notifyDone();\n" " }\n" " this.workerThreadCount = 0; \n" "}\n" - "window.layoutTestController = new LayoutTestController();\n" - "window.testRunner = window.layoutTestController;\n" - "window.addEventListener('load', layoutTestController.OnEvent, false);\n" + "window.testRunner = new TestRunner();\n" + "window.addEventListener('load', testRunner.OnEvent, false);\n" "</script>"; } |