Extend components/test_runner's generated WebMediaStream to have a Chrome VideoTrack and Source

BUG=262211, 532509

Review URL: https://codereview.chromium.org/1391363002

Cr-Commit-Position: refs/heads/master@{#353012}

4 files changed, 20 insertions, 17 deletions

diff --git a/components/test_runner/mock_web_user_media_client.cc b/components/test_runner/mock_web_user_media_client.cc
index f30fac9..7cff4c3 100644
--- a/components/test_runner/mock_web_user_media_client.cc
+++ b/components/test_runner/mock_web_user_media_client.cc
@@ -18,7 +18,6 @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
-#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
 #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
 
 using blink::WebMediaConstraints;
@@ -161,34 +160,34 @@ void MockWebUserMediaClient::requestUserMedia(
       return;
     }
 
-    const size_t zero = 0;
-    const size_t one = 1;
-    WebVector<WebMediaStreamTrack> audio_tracks(request.audio() ? one : zero);
-    WebVector<WebMediaStreamTrack> video_tracks(request.video() ? one : zero);
+    WebMediaStream stream;
+    stream.initialize(WebVector<WebMediaStreamTrack>(),
+                      WebVector<WebMediaStreamTrack>());
+    stream.setExtraData(new MockExtraData());
 
     if (request.audio()) {
       WebMediaStreamSource source;
       source.initialize("MockAudioDevice#1",
                         WebMediaStreamSource::TypeAudio,
                         "Mock audio device",
-                        false /* remote */, true /* readonly */);
-      audio_tracks[0].initialize(source);
+                        false /* remote */,
+                        true /* readonly */);
+      WebMediaStreamTrack web_track;
+      web_track.initialize(source);
+      stream.addTrack(web_track);
     }
 
-    if (request.video()) {
+    if (request.video() && !delegate_->AddMediaStreamSourceAndTrack(&stream)) {
       WebMediaStreamSource source;
       source.initialize("MockVideoDevice#1",
                         WebMediaStreamSource::TypeVideo,
                         "Mock video device",
                         false /* remote */, true /* readonly */);
-      video_tracks[0].initialize(source);
+      WebMediaStreamTrack web_track;
+      web_track.initialize(source);
+      stream.addTrack(web_track);
     }
 
-    WebMediaStream stream;
-    stream.initialize(audio_tracks, video_tracks);
-
-    stream.setExtraData(new MockExtraData());
-
     delegate_->PostTask(new UserMediaRequestTask(this, request, stream));
 }
 
diff --git a/components/test_runner/mock_web_user_media_client.h b/components/test_runner/mock_web_user_media_client.h
index dda0d4df..33b55d5 100644
--- a/components/test_runner/mock_web_user_media_client.h
+++ b/components/test_runner/mock_web_user_media_client.h
@@ -5,7 +5,6 @@
 #ifndef COMPONENTS_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_
 #define COMPONENTS_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_
 
-#include "base/macros.h"
 #include "components/test_runner/web_task.h"
 #include "third_party/WebKit/public/web/WebUserMediaClient.h"
 
diff --git a/components/test_runner/test_runner.h b/components/test_runner/test_runner.h
index 45ee51a..b227a7ee 100644
--- a/components/test_runner/test_runner.h
+++ b/components/test_runner/test_runner.h
@@ -23,6 +23,7 @@ class SkBitmap;
 namespace blink {
 class WebContentSettingsClient;
 class WebFrame;
+class WebMediaStream;
 class WebString;
 class WebView;
 class WebURLResponse;
diff --git a/components/test_runner/web_test_delegate.h b/components/test_runner/web_test_delegate.h
index 26b135a..d53852e 100644
--- a/components/test_runner/web_test_delegate.h
+++ b/components/test_runner/web_test_delegate.h
@@ -27,13 +27,14 @@ class WebGamepads;
 class WebHistoryItem;
 class WebLayer;
 class WebLocalFrame;
+class WebMediaStream;
 class WebPlugin;
 struct WebPluginParams;
-class WebURLResponse;
-class WebView;
 struct WebRect;
 struct WebSize;
 struct WebURLError;
+class WebURLResponse;
+class WebView;
 }
 
 namespace cc {
@@ -244,6 +245,9 @@ class WebTestDelegate {
   // Clear all the permissions set via SetPermission().
   virtual void ResetPermissions() = 0;
 
+  // Add content MediaStream classes to the Blink MediaStream ones.
+  virtual bool AddMediaStreamSourceAndTrack(blink::WebMediaStream* stream) = 0;
+
   virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;
 
   // Causes the beforeinstallprompt event to be sent to the renderer with a