diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 20:47:53 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 20:47:53 +0000 |
| commit | 2b035f35d89f2db3eaaba7ff250072ec796df739 (patch) | |
| tree | 2ea250ebf0e172a36bd7706982aa568901790e6d /content | |
| parent | c8bbda0fd7d40dc732ccb5440963002fccbe1643 (diff) | |
| download | chromium_src-2b035f35d89f2db3eaaba7ff250072ec796df739.zip chromium_src-2b035f35d89f2db3eaaba7ff250072ec796df739.tar.gz chromium_src-2b035f35d89f2db3eaaba7ff250072ec796df739.tar.bz2 | |
[content shell] always return the time relative to the unix epoch for layout tests
BUG=111316
R=thakis@chromium.org
TEST=fast/mediastream/RTCPeerConnection-stats.html passes
Review URL: https://codereview.chromium.org/12674011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/webkit_test_runner.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc index f0c0a2f..6c3f008 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/webkit_test_runner.cc @@ -212,8 +212,9 @@ WebString WebKitTestRunner::registerIsolatedFileSystem( } long long WebKitTestRunner::getCurrentTimeInMillisecond() { - return base::TimeTicks::Now().ToInternalValue() / - base::Time::kMicrosecondsPerMillisecond; + return base::TimeDelta(base::Time::Now() - + base::Time::UnixEpoch()).ToInternalValue() / + base::Time::kMicrosecondsPerMillisecond; } WebString WebKitTestRunner::getAbsoluteWebStringFromUTF8Path( |