diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 13:12:09 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 13:12:09 +0000 |
| commit | 6f6aef2562029e484a502161944e49bb0b7aa392 (patch) | |
| tree | d98ec7d5a15d067919d93f1d26920de24fdfebc6 /webkit | |
| parent | 53e1f5dddb73b45ae97c1a40872392acf60e44eb (diff) | |
| download | chromium_src-6f6aef2562029e484a502161944e49bb0b7aa392.zip chromium_src-6f6aef2562029e484a502161944e49bb0b7aa392.tar.gz chromium_src-6f6aef2562029e484a502161944e49bb0b7aa392.tar.bz2 | |
Layout tests expect the time to be relative to the unix epoch.
base::Time is relative to the windows epoch, and base::TimeTicks is entirely
platform dependent. Decision: use base::Time and manually shift it relative to
the unix epoch
This fixes fast/mediastream/RTCPeerConnection-stats*html
BUG=none
R=tony@chromium.org
Review URL: https://codereview.chromium.org/12212107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/webkit_support.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 153deb3..357c94c 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -749,8 +749,9 @@ ScopedTempDirectory* CreateScopedTempDirectory() { } int64 GetCurrentTimeInMillisecond() { - return base::TimeTicks::Now().ToInternalValue() - / base::Time::kMicrosecondsPerMillisecond; + return base::TimeDelta(base::Time::Now() - + base::Time::UnixEpoch()).ToInternalValue() / + base::Time::kMicrosecondsPerMillisecond; } std::string EscapePath(const std::string& path) { |