Media Related changes for TabCapture API

content/renderer/media/media_stream_dispatcher_unittest.cc

Index: content/renderer/media/media_stream_dispatcher_unittest.cc
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc
index a7190b940095e5cb290ee3a3dd917f6580ac6282..e5059e235719277c6a7fb3e0a1295a6217bc2c83 100644
--- a/content/renderer/media/media_stream_dispatcher_unittest.cc
+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -177,16 +177,17 @@ TEST(MediaStreamDispatcherTest, BasicStreamForDevice) {
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
-  media_stream::StreamOptions components(kNoAudioType, kVideoType);
+  media_stream::StreamOptions components(
+      kNoAudioType, kDeviceId, kVideoType, kDeviceId);
   GURL security_origin;
 
   int ipc_request_id1 = dispatcher->next_ipc_id_;
-  dispatcher->GenerateStreamForDevice(kRequestId1, handler.get()->AsWeakPtr(),
-                                      components, kDeviceId, security_origin);
+  dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
+                             components, security_origin);
   int ipc_request_id2 = dispatcher->next_ipc_id_;
   EXPECT_NE(ipc_request_id1, ipc_request_id2);
-  dispatcher->GenerateStreamForDevice(kRequestId2, handler.get()->AsWeakPtr(),
-                                      components, kDeviceId, security_origin);
+  dispatcher->GenerateStream(kRequestId2, handler.get()->AsWeakPtr(),
+                             components, security_origin);
   EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
 
   // No audio requested.