chrome_frame/test/chrome_frame_automation_mock.cc - Issue 10019015: Update uses of TimeDelta in chrome_frame/*.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/test/chrome_frame_automation_mock.cc

Issue 10019015: Update uses of TimeDelta in chrome_frame/*. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome_frame/test/automation_client_mock.cc ('K') | « chrome_frame/test/automation_client_mock.cc ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | chrome_frame/test/mock_ie_event_sink_actions.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome_frame/test/chrome_frame_automation_mock.cc

diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc

index 1f50b2efb8a2558fe3cb8c90937c60d2ac5cf681..596e103b53529c753bfac50ed8a1cb75a131524d 100644

--- a/chrome_frame/test/chrome_frame_automation_mock.cc

+++ b/chrome_frame/test/chrome_frame_automation_mock.cc

@@ -12,7 +12,9 @@ TEST(ChromeFrame, Launch) {

MessageLoopForUI loop;

AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);

- loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

+ loop.PostDelayedTask(FROM_HERE,

+ MessageLoop::QuitClosure(),

+ base::TimeDelta::FromMilliseconds(kLongWaitTimeout));

mock_launch.Navigate("about:blank");

loop.RunWithDispatcher(NULL);

@@ -23,7 +25,9 @@ TEST(ChromeFrame, Navigate) {

MessageLoopForUI loop;

AutomationMockNavigate mock_navigate(&loop, kLongWaitTimeout);

- loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

+ loop.PostDelayedTask(FROM_HERE,

+ MessageLoop::QuitClosure(),

+ base::TimeDelta::FromMilliseconds(kLongWaitTimeout));

mock_navigate.NavigateRelativeFile(L"postmessage_basic_frame.html");

loop.RunWithDispatcher(NULL);

@@ -34,7 +38,9 @@ TEST(ChromeFrame, PostMessage) {

MessageLoopForUI loop;

AutomationMockPostMessage mock_postmessage(&loop, kLongWaitTimeout);

- loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

+ loop.PostDelayedTask(FROM_HERE,

+ MessageLoop::QuitClosure(),

+ base::TimeDelta::FromMilliseconds(kLongWaitTimeout));

mock_postmessage.NavigateRelativeFile(L"postmessage_basic_frame.html");

loop.RunWithDispatcher(NULL);

@@ -46,7 +52,9 @@ TEST(ChromeFrame, RequestStart) {

AutomationMockHostNetworkRequestStart mock_request_start(&loop,

kLongWaitTimeout);

- loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

+ loop.PostDelayedTask(FROM_HERE,

+ MessageLoop::QuitClosure(),

+ base::TimeDelta::FromMilliseconds(kLongWaitTimeout));

mock_request_start.NavigateRelative(L"postmessage_basic_frame.html");

loop.RunWithDispatcher(NULL);