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..261fb44ee2f100e25e36c229239a15ee09d4b004
--- /dev/null
+++ b/content/renderer/media/media_stream_extra_data.h
@@ -0,0 +1,37 @@
+// 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 "content/common/content_export.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;
+}

[tommi (sloooow) - chröme, 2012/05/14 14:33:52]

}  // namespace webrtc

[perkj_chrome, 2012/05/14 15:14:33]

Done.

+
+class CONTENT_EXPORT MediaStreamExtraData
+    : public WebKit::WebMediaStreamDescriptor::ExtraData {
+ public:
+  explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
+  explicit MediaStreamExtraData(
+      webrtc::LocalMediaStreamInterface* local_stream);
+  virtual ~MediaStreamExtraData();
+
+  webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
+  webrtc::LocalMediaStreamInterface* local_stream() {
+    return local_stream_.get();
+  }
+
+ private:
+  talk_base::scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
+  talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData);
+};
+
+#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_