Unit test for WebMediaPlayerMS

content/renderer/media/webmediaplayer_ms.h

Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index 762daaad07ab6b48a9711f70b5e9f798c73ed034..ce62a214b5e7a82d644cd008db4d353c3095383d 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
+#include "content/common/content_export.h"
 #include "media/blink/webmediaplayer_util.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/renderers/skcanvas_video_renderer.h"
@@ -58,9 +59,9 @@ class WebMediaPlayerMSCompositor;
 //
 // blink::WebMediaPlayerClient
 //   WebKit client of this media player object.
-class WebMediaPlayerMS
-    : public blink::WebMediaPlayer,
-      public base::SupportsWeakPtr<WebMediaPlayerMS> {
+class CONTENT_EXPORT WebMediaPlayerMS
+    : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
+      public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>) {
  public:
   // Construct a WebMediaPlayerMS with reference to the client, and
   // a MediaStreamClient which provides VideoFrameProvider.
@@ -143,6 +144,8 @@ class WebMediaPlayerMS
       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.
@@ -159,6 +162,10 @@ class WebMediaPlayerMS
   // Getter method to |client_|.
   blink::WebMediaPlayerClient* get_client() { return client_; }
 
+  // For unit test use only.
+  // Returns the pointer to the WebMediaPlayerMSCompositor.
+  WebMediaPlayerMSCompositor* GetCompositorForTesting();
+
   blink::WebFrame* const frame_;
 
   blink::WebMediaPlayer::NetworkState network_state_;
@@ -199,7 +206,7 @@ class WebMediaPlayerMS
   const scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
 
   const std::string initial_audio_output_device_id_;
-  const url::Origin initial_security_origin_;
+  url::Origin initial_security_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };