Revert of Unit test for WebMediaPlayerMS

content/renderer/media/webmediaplayer_ms.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "content/common/content_export.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "media/blink/webmediaplayer_util.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/renderers/skcanvas_video_renderer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "url/origin.h"
 
 namespace blink {
 class WebFrame;
 class WebGraphicsContext3D;
@@ skipping 25 matching lines @@
 // All calls to WebMediaPlayerMS methods must be from the main thread of
 // Renderer process.
 //
 // WebMediaPlayerMS works with multiple objects, the most important ones are:
 //
 // VideoFrameProvider
 //   provides video frames for rendering.
 //
 // blink::WebMediaPlayerClient
 //   WebKit client of this media player object.
-class CONTENT_EXPORT WebMediaPlayerMS
-    : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
-      public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>),
-      public NON_EXPORTED_BASE(RenderFrameObserver) {
+class WebMediaPlayerMS
+    : public blink::WebMediaPlayer,
+      public base::SupportsWeakPtr<WebMediaPlayerMS>,
+      public RenderFrameObserver {
  public:
   // Construct a WebMediaPlayerMS with reference to the client, and
   // a MediaStreamClient which provides VideoFrameProvider.
   WebMediaPlayerMS(
       blink::WebFrame* frame,
       blink::WebMediaPlayerClient* client,
       base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
       media::MediaLog* media_log,
       scoped_ptr<MediaStreamRendererFactory> factory,
       const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
@@ skipping 67 matching lines @@
 
   bool copyVideoTextureToPlatformTexture(
       blink::WebGraphicsContext3D* web_graphics_context,
       unsigned int texture,
       unsigned int internal_format,
       unsigned int type,
       bool premultiply_alpha,
       bool flip_y) override;
 
  private:
-  friend class WebMediaPlayerMSTest;
-
   // The callback for VideoFrameProvider to signal a new frame is available.
   void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame);
   // Need repaint due to state change.
   void RepaintInternal();
 
   // The callback for source to report error.
   void OnSourceError();
 
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
@@ skipping 45 matching lines @@
 
   const std::string initial_audio_output_device_id_;
   const url::Origin initial_security_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_