Revert everything related to the relanding.

webkit/glue/webmediaplayer_impl.h

 // Copyright (c) 2010 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 40 matching lines @@
 // list of the main thread.
 
 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
 
 #include <vector>
 
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/waitable_event.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_impl.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h"
 
 class GURL;
@@ skipping 259 matching lines @@
       WebMediaPlayerImpl::Proxy* proxy) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebVideoRendererFactoryFactory);
 };
 
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_