Reland of Make rendering of MediaStreams reflect changes to its set of tracks.

content/shell/test_runner/mock_web_user_media_client.cc

 // Copyright 2014 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.
 
 #include "content/shell/test_runner/mock_web_user_media_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 using blink::WebMediaDevicesRequest;
 using blink::WebMediaStream;
 using blink::WebMediaStreamSource;
 using blink::WebMediaStreamTrack;
 using blink::WebString;
 using blink::WebUserMediaRequest;
 using blink::WebVector;
 
 namespace test_runner {
 
-class MockExtraData : public WebMediaStream::ExtraData {};
-
 MockWebUserMediaClient::MockWebUserMediaClient(WebTestDelegate* delegate)
     : delegate_(delegate),
       should_enumerate_extra_device_(false),
       weak_factory_(this) {}
 
 MockWebUserMediaClient::~MockWebUserMediaClient() {}
 
 void MockWebUserMediaClient::RequestUserMedia(
     const WebUserMediaRequest& stream_request) {
   DCHECK(!stream_request.IsNull());
   WebUserMediaRequest request = stream_request;
 
   if (request.OwnerDocument().IsNull() || !request.OwnerDocument().GetFrame()) {
     delegate_->PostTask(
         base::Bind(&WebUserMediaRequest::RequestFailed,
                    base::Owned(new WebUserMediaRequest(request)), WebString()));
     return;
   }
 
   WebMediaStream stream;
   stream.Initialize(WebVector<WebMediaStreamTrack>(),
                     WebVector<WebMediaStreamTrack>());
-  stream.SetExtraData(new MockExtraData());
 
   if (request.Audio() &&
       !delegate_->AddMediaStreamAudioSourceAndTrack(&stream)) {
     WebMediaStreamSource source;
     source.Initialize("MockAudioDevice#1", WebMediaStreamSource::kTypeAudio,
                       "Mock audio device", false /* remote */);
     WebMediaStreamTrack web_track;
     web_track.Initialize(source);
     stream.AddTrack(web_track);
   }
@@ skipping 61 matching lines @@
   if (!media_device_change_observer_.IsNull())
     media_device_change_observer_.DidChangeMediaDevices();
 }
 
 void MockWebUserMediaClient::SetMediaDeviceChangeObserver(
     const blink::WebMediaDeviceChangeObserver& observer) {
   media_device_change_observer_ = observer;
 }
 
 }  // namespace test_runner