diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /media/base/media_log.cc | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'media/base/media_log.cc')
| -rw-r--r-- | media/base/media_log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc index 877feffcfa..0f2e182284 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -118,7 +118,7 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) { scoped_ptr<MediaLogEvent> event(new MediaLogEvent); event->id = id_; event->type = type; - event->time = base::Time::Now(); + event->time = base::TimeTicks::Now(); return event.Pass(); } |