summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
-rw-r--r--webkit/tools/test_shell/webwidget_host.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 201c3c7..aadbd39 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -160,7 +160,7 @@ void LayoutTestController::waitUntilDone(
FROM_HERE,
base::Bind(&LayoutTestController::notifyDoneTimedOut,
weak_factory_.GetWeakPtr()),
- shell_->GetLayoutTestTimeout());
+ base::TimeDelta::FromMilliseconds(shell_->GetLayoutTestTimeout()));
}
wait_until_done_ = true;
diff --git a/webkit/tools/test_shell/webwidget_host.cc b/webkit/tools/test_shell/webwidget_host.cc
index 32b399b..1e6f96a 100644
--- a/webkit/tools/test_shell/webwidget_host.cc
+++ b/webkit/tools/test_shell/webwidget_host.cc
@@ -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.
@@ -11,5 +11,5 @@ void WebWidgetHost::ScheduleAnimation() {
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&WebWidgetHost::ScheduleComposite, weak_factory_.GetWeakPtr()),
- 10);
+ base::TimeDelta::FromMilliseconds(10));
}