diff options
| -rwxr-xr-x | chrome/tools/test/generate_mime_tests.pl | 8 | ||||
| -rw-r--r-- | content/browser/appcache/appcache_browsertest.cc | 2 | ||||
| -rw-r--r-- | content/shell/layout_test_controller.js | 4 | ||||
| -rw-r--r-- | content/shell/layout_test_controller_host.h | 2 | ||||
| -rw-r--r-- | content/shell/shell_messages.h | 2 | ||||
| -rw-r--r-- | content/test/layout_browsertest.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.h | 2 | ||||
| -rw-r--r-- | webkit/support/simple_database_system.h | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/notification_presenter.h | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 |
10 files changed, 18 insertions, 21 deletions
diff --git a/chrome/tools/test/generate_mime_tests.pl b/chrome/tools/test/generate_mime_tests.pl index 616c421..aee6fd1 100755 --- a/chrome/tools/test/generate_mime_tests.pl +++ b/chrome/tools/test/generate_mime_tests.pl @@ -217,8 +217,8 @@ foreach $content_type ( @content_type) { print OUT "This HTML is used to test HTTP content-type \"$content_type\"". " by having multiple iframes render different types of content for the". " same HTTP content-type header.\n"; - print OUT "<script>\n if(window.layoutTestController)\n " . - "window.layoutTestController.waitUntilDone();\n</script>\n"; + print OUT "<script>\n if(window.testRunner)\n " . + "window.testRunner.waitUntilDone();\n</script>\n"; print OUT "<html>\n<body>\n<br>Well here are the frames !<br>\n"; foreach $parameter ( @parameter ) { @@ -239,8 +239,8 @@ foreach $content_type ( @content_type) { } print OUT "</body>\n</html>\n"; - print OUT "<script>\n if(window.layoutTestController)\n ". - "layoutTestController.notifyDone();\n</script>"; + print OUT "<script>\n if(window.testRunner)\n ". + "testRunner.notifyDone();\n</script>"; close OUT; } diff --git a/content/browser/appcache/appcache_browsertest.cc b/content/browser/appcache/appcache_browsertest.cc index cff8223..dfd5f1e 100644 --- a/content/browser/appcache/appcache_browsertest.cc +++ b/content/browser/appcache/appcache_browsertest.cc @@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(AppCacheLayoutTest, DISABLED_PHP) { }; // This tests loads a data url which calls notifyDone, this just - // doesn't work with the layoutTestController in this test harness. + // doesn't work with the testRunner in this test harness. // "fail-on-update.html", // Flaky for reasons i don't yet see? diff --git a/content/shell/layout_test_controller.js b/content/shell/layout_test_controller.js index 43527e1..66fbcf8 100644 --- a/content/shell/layout_test_controller.js +++ b/content/shell/layout_test_controller.js @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -var layoutTestController = layoutTestController || {}; var testRunner = testRunner || {}; var accessibilityController = accessibilityController || {}; var gamepadController = gamepadController || {}; @@ -43,8 +42,7 @@ var textInputController = textInputController || {}; {value: SetShouldStayOnPageAfterHandlingBeforeUnload}); Object.defineProperty(this, "waitUntilDone", {value: SetWaitUntilDone}); } - LayoutTestController.prototype = DefaultHandler("layoutTestController"); - layoutTestController = new LayoutTestController(); + LayoutTestController.prototype = DefaultHandler("testRunner"); testRunner = new LayoutTestController(); var AccessibilityController = function() {} diff --git a/content/shell/layout_test_controller_host.h b/content/shell/layout_test_controller_host.h index 29cd181..dfb3016 100644 --- a/content/shell/layout_test_controller_host.h +++ b/content/shell/layout_test_controller_host.h @@ -42,7 +42,7 @@ class LayoutTestControllerHost : public RenderViewHostObserver { void OnTextDump(const std::string& dump); void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); - // layoutTestController handlers. + // testRunner handlers. void OnNotifyDone(); void OnDumpAsText(); void OnDumpChildFramesAsText(); diff --git a/content/shell/shell_messages.h b/content/shell/shell_messages.h index b0603bf..53840c5 100644 --- a/content/shell/shell_messages.h +++ b/content/shell/shell_messages.h @@ -35,7 +35,7 @@ IPC_MESSAGE_ROUTED2(ShellViewHostMsg_ImageDump, // The main frame of the render view finished loading. IPC_MESSAGE_ROUTED0(ShellViewHostMsg_DidFinishLoad) -// The following messages correspond to methods of the layoutTestController. +// The following messages correspond to methods of the testRunner. IPC_MESSAGE_ROUTED0(ShellViewHostMsg_NotifyDone) IPC_MESSAGE_ROUTED0(ShellViewHostMsg_DumpAsText) IPC_MESSAGE_ROUTED0(ShellViewHostMsg_DumpChildFramesAsText) 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>"; } diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 30f5181..315b0df 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -71,7 +71,7 @@ int NumberOfPages(WebKit::WebFrame* web_frame, string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame, bool recursive); // Returns a dump of the given history state suitable for implementing the -// dumpBackForwardList command of the layoutTestController. +// dumpBackForwardList command of the testRunner. WEBKIT_GLUE_EXPORT string16 DumpHistoryState(const std::string& history_state, int indent, bool is_current); diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index 05f8189..f04a5fa 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -45,7 +45,7 @@ class SimpleDatabaseSystem : public webkit_database::DatabaseTracker::Observer, int64 GetFileSize(const string16& vfs_file_name); int64 GetSpaceAvailable(const string16& origin_identifier); - // For use by LayoutTestController, called on the main thread. + // For use by testRunner, called on the main thread. void ClearAllDatabases(); void SetDatabaseQuota(int64 quota); diff --git a/webkit/tools/test_shell/notification_presenter.h b/webkit/tools/test_shell/notification_presenter.h index cf5981b..85ddef5 100644 --- a/webkit/tools/test_shell/notification_presenter.h +++ b/webkit/tools/test_shell/notification_presenter.h @@ -20,7 +20,7 @@ class TestNotificationPresenter : public WebKit::WebNotificationPresenter { void Reset(); - // Called by the LayoutTestController to simulate a user granting + // Called by the testRunner to simulate a user granting // permission. void grantPermission(const std::string& origin); diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 88fe894..5ee9f2b 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -433,7 +433,7 @@ void TestShell::CallJSGC() { WebView* TestShell::CreateWebView() { // If we're running layout tests, only open a new window if the test has - // called layoutTestController.setCanOpenWindows() + // called testRunner.setCanOpenWindows() if (layout_test_mode_) return NULL; |