summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.h2
-rw-r--r--webkit/support/simple_database_system.h4
-rw-r--r--webkit/tools/test_shell/notification_presenter.h2
-rw-r--r--webkit/tools/test_shell/test_shell.cc2
4 files changed, 5 insertions, 5 deletions
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;