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 15bdc9e50701317fb466cbec3ca69796f886640f..ad822643810168589fe3d3b2281a9e23bb1bda02 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -9,6 +9,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/skcanvas_video_renderer.h"
 #include "media/blink/webmediaplayer_util.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
@@ -21,6 +22,10 @@ class WebGraphicsContext3D;
 class WebMediaPlayerClient;
 }
 
+namespace cc {
+class VideoFrameProvider;
+}
+
 namespace media {
 class MediaLog;
 class WebMediaPlayerDelegate;
@@ -54,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.
@@ -134,6 +139,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.
@@ -150,6 +157,9 @@ class WebMediaPlayerMS
   // Getter method to |client_|.
   blink::WebMediaPlayerClient* get_client() { return client_; }
 
+  // Correspondence of load(), for unit test use only.
+  cc::VideoFrameProvider* LoadForTesting(bool algorithm_enabled);

[mcasas, 2015/10/21 19:54:02]

Load what exactly?
Write a more significant comment.

[qiangchen, 2015/10/22 17:22:58]

Done.

+
   blink::WebFrame* const frame_;
 
   blink::WebMediaPlayer::NetworkState network_state_;