chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc - Issue 10689157: Switch to TimeDelta interfaces for TestTimeouts in sync code.

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/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

Issue 10689157: Switch to TimeDelta interfaces for TestTimeouts in sync code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix error messaging again. Created 8 years, 5 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

« no previous file with comments | « chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/session_model_associator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

index 7f0a37de7c867ce33d232de22d1dd3064ea49ca8..6c43830af8255877ca41b672fcff5ca03122d0ff 100644

--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

@@ -185,8 +185,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test {

WaitableEvent done(true, false);

BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,

base::Bind(&SyncNonFrontendDataTypeControllerTest::SignalDone, &done));

- done.TimedWait(base::TimeDelta::FromMilliseconds(

- TestTimeouts::action_timeout_ms()));

+ done.TimedWait(TestTimeouts::action_timeout());

if (!done.IsSignaled()) {

ADD_FAILURE() << "Timed out waiting for DB thread to finish.";

}