diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 19:39:10 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 19:39:10 +0000 |
| commit | 0f678822946b5cafbad5a5c81270356c56ac3138 (patch) | |
| tree | dd8932c5bd780679f883de8c7b2ece0a659016bc /media/base/clock.cc | |
| parent | 45e4fab2ec46c7a3ebe6476f5a6d25f2aaf1e4cf (diff) | |
| download | chromium_src-0f678822946b5cafbad5a5c81270356c56ac3138.zip chromium_src-0f678822946b5cafbad5a5c81270356c56ac3138.tar.gz chromium_src-0f678822946b5cafbad5a5c81270356c56ac3138.tar.bz2 | |
Revert 116889 - Creating integration tests for media pipeline that use real decoders and demuxers.
Reverting because Windows TSAN is failing.
TEST=PipelineIntegrationTest
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=116349
Review URL: http://codereview.chromium.org/8968035
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/9146009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/clock.cc')
| -rw-r--r-- | media/base/clock.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/media/base/clock.cc b/media/base/clock.cc index aaa0c13..61096177 100644 --- a/media/base/clock.cc +++ b/media/base/clock.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,10 +17,6 @@ Clock::Clock(TimeProvider* time_provider) Clock::~Clock() {} -bool Clock::IsPlaying() const { - return playing_; -} - base::TimeDelta Clock::Play() { DCHECK(!playing_); reference_ = GetTimeFromProvider(); |