Refactor MediaStreamImpl and PeerConnection glue implementation after WebKit changes.

content/renderer/media/media_stream_extra_data.h

Index: content/renderer/media/media_stream_extra_data.h
diff --git a/content/renderer/media/media_stream_extra_data.h b/content/renderer/media/media_stream_extra_data.h
new file mode 100644
index 0000000000000000000000000000000000000000..40975b1a0b0d87488c83c5d5b54096d7e150480e
--- /dev/null
+++ b/content/renderer/media/media_stream_extra_data.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2012 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.
+
+#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
+#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
+
+#include "base/basictypes.h"
+#include "content/common/content_export.h"
+#include "content/renderer/media/media_stream_impl.h"
+#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
+
+namespace webrtc {
+class MediaStreamInterface;
+class LocalMediaStreamInterface;
+}
+
+class CONTENT_EXPORT MediaStreamExtraData
+    : public WebKit::WebMediaStreamDescriptor::ExtraData {
+ public:
+  MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream)
+      : remote_stream_(remote_stream) {
+  }
+  MediaStreamExtraData(webrtc::LocalMediaStreamInterface* local_stream)
+      : local_stream_(local_stream) {
+  }
+
+  webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
+  webrtc::LocalMediaStreamInterface* local_stream() {
+    return local_stream_.get();
+  }
+
+ private:
+  typedef talk_base::scoped_refptr<webrtc::MediaStreamInterface>
+  RemoteMediaStreamPtr;

[tommi (sloooow) - chröme, 2012/05/13 20:08:46]

indent

[perkj_chrome, 2012/05/14 11:50:25]

Done.

+  RemoteMediaStreamPtr remote_stream_;
+  typedef talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
+  LocalMediaStreamPtr;

[tommi (sloooow) - chröme, 2012/05/13 20:08:46]

indent

[perkj_chrome, 2012/05/14 11:50:25]

Done.

+  LocalMediaStreamPtr local_stream_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData);
+};
+
+#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_