Reverting r24002 due to test_shell_tests redness

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24004 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 11 deletions

diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 0438e54..d3d3679 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -272,7 +272,6 @@ void WebMediaPlayerImpl::seek(float seconds) {
 
   // Try to preserve as much accuracy as possible.
   float microseconds = seconds * base::Time::kMicrosecondsPerSecond;
-  SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
   pipeline_->Seek(
       base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds)),
       NewCallback(proxy_.get(),
@@ -362,10 +361,7 @@ bool WebMediaPlayerImpl::paused() const {
 bool WebMediaPlayerImpl::seeking() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
-  if (ready_state_ == WebKit::WebMediaPlayer::HaveNothing)
-    return false;
-  
-  return ready_state_ == WebKit::WebMediaPlayer::HaveMetadata;
+  return false;
 }
 
 float WebMediaPlayerImpl::duration() const {
@@ -471,11 +467,7 @@ void WebMediaPlayerImpl::OnPipelineInitialize() {
     // TODO(hclam): change this to report the correct status.
     SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
     SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
-    if (pipeline_->IsLoaded()) {
-      SetNetworkState(WebKit::WebMediaPlayer::Loaded);
-    } else {
-      SetNetworkState(WebKit::WebMediaPlayer::Loading);
-    }
+    SetNetworkState(WebKit::WebMediaPlayer::Loaded);
   } else {
     // TODO(hclam): should use pipeline_->GetError() to determine the state
     // properly and reports error using MediaError.
@@ -492,7 +484,6 @@ void WebMediaPlayerImpl::OnPipelineInitialize() {
 void WebMediaPlayerImpl::OnPipelineSeek() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
-    SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
     GetClient()->timeChanged();
   }
 }