Fixes for build errors introduced most likely earlier today.

Review URL: http://webrtc-codereview.appspot.com/228003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@742 4adac7df-926f-26a2-2b94-8c16560cd09d

third_party_mods/libjingle/libjingle.gyp

@@ -109,6 +109,11 @@
       },
     },
     'conditions': [
+      ['peer_connection_dev==1', {
+        'include_dirs': [
+          '<(libjingle_mods)/source',
+        ],
+      }],
       ['inside_chromium_build==1', {
         'defines': [
           'NO_SOUND_SYSTEM',
@@ -533,8 +538,6 @@
         '<(libjingle_orig)/source/talk/session/phone/audiomonitor.h',
         '<(libjingle_orig)/source/talk/session/phone/call.cc',
         '<(libjingle_orig)/source/talk/session/phone/call.h',
-        '<(libjingle_orig)/source/talk/session/phone/channel.cc',
-        '<(libjingle_orig)/source/talk/session/phone/channel.h',
         '<(libjingle_orig)/source/talk/session/phone/channelmanager.cc',
         '<(libjingle_orig)/source/talk/session/phone/channelmanager.h',
         '<(libjingle_orig)/source/talk/session/phone/codec.cc',
@@ -553,7 +556,6 @@
         '<(libjingle_orig)/source/talk/session/phone/mediamessages.h',
         '<(libjingle_orig)/source/talk/session/phone/mediamonitor.cc',
         '<(libjingle_orig)/source/talk/session/phone/mediamonitor.h',
-        '<(libjingle_orig)/source/talk/session/phone/mediasession.cc',
         '<(libjingle_orig)/source/talk/session/phone/mediasessionclient.cc',
         '<(libjingle_orig)/source/talk/session/phone/mediasessionclient.h',
         '<(libjingle_orig)/source/talk/session/phone/mediasink.h',
@@ -629,12 +631,18 @@
           ],
         } ],  # inside_chromium_build
         ['peer_connection_dev==1', {
-          'sources-': [
+          'sources': [
+            '<(libjingle_mods)/source/talk/p2p/client/fakeportallocator.h',
+            '<(libjingle_mods)/source/talk/session/phone/channel.cc',
+            '<(libjingle_mods)/source/talk/session/phone/channel.h',
+            '<(libjingle_mods)/source/talk/session/phone/mediasession.cc',
+          ],
+        },{
+          'sources': [
+            '<(libjingle_orig)/source/talk/session/phone/channel.cc',
+            '<(libjingle_orig)/source/talk/session/phone/channel.h',
             '<(libjingle_orig)/source/talk/session/phone/mediasession.cc',
           ],
-          'sources+': [
-            '<(libjingle_mods)/source/talk/session/phone/mediasession.cc',
-          ]
         }], # peer_connection_dev
       ],  # conditions
     },
@@ -741,11 +749,13 @@
             ['inside_chromium_build==1', {
               'dependencies': [        
                 '../../third_party/webrtc/modules/modules.gyp:audio_device',
+                '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
                 '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
               ],
             }, {
               'dependencies': [
                 '../../src/modules/modules.gyp:audio_device',
+                '../../src/modules/modules.gyp:video_capture_module',
                 '../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
                ],
             }],

third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamproxy.cc

@@ -26,6 +26,8 @@
  */
 
 #include "talk/app/webrtc_dev/mediastreamproxy.h"
+#include "talk/app/webrtc_dev/ref_count.h"
+#include "talk/app/webrtc_dev/scoped_refptr.h"
 
 namespace {
 
@@ -74,8 +76,8 @@ scoped_refptr<MediaStreamProxy> MediaStreamProxy::Create(
     const std::string& label,
     talk_base::Thread* signaling_thread) {
   ASSERT(signaling_thread);
-  RefCountImpl<MediaStreamProxy>* stream =
+  talk_base::RefCountImpl<MediaStreamProxy>* stream =
-      new RefCountImpl<MediaStreamProxy>(label, signaling_thread);
+      new talk_base::RefCountImpl<MediaStreamProxy>(label, signaling_thread);
   return stream;
 }
 
@@ -83,7 +85,7 @@ MediaStreamProxy::MediaStreamProxy(const std::string& label,
                                    talk_base::Thread* signaling_thread)
     : signaling_thread_(signaling_thread),
       media_stream_impl_(MediaStreamImpl::Create(label)),
-      track_list_(new RefCountImpl<MediaStreamTrackListProxy>(
+      track_list_(new talk_base::RefCountImpl<MediaStreamTrackListProxy>(
           media_stream_impl_->tracks(),
           signaling_thread_)) {
 }
@@ -92,7 +94,7 @@ const std::string& MediaStreamProxy::label() {
   return media_stream_impl_->label();
 }
 
-scoped_refptr<MediaStreamTrackList> MediaStreamProxy::tracks() {
+MediaStreamTrackList* MediaStreamProxy::tracks() {
   return track_list_;
 }
 
@@ -197,7 +199,7 @@ size_t MediaStreamProxy::MediaStreamTrackListProxy::count() {
   return track_list_->count();
 }
 
-scoped_refptr<MediaStreamTrack> MediaStreamProxy::MediaStreamTrackListProxy::at(
+MediaStreamTrack* MediaStreamProxy::MediaStreamTrackListProxy::at(
     size_t index) {
   if (!signaling_thread_->IsCurrent()) {
     MediaStreamTrackAtMessageData msg(index);

third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamproxy.h

@@ -48,7 +48,7 @@ class MediaStreamProxy : public LocalMediaStream,
     MediaStreamTrackListProxy(MediaStreamTrackList* track_list,
                               talk_base::Thread* signaling_thread);
     virtual size_t count();
-    virtual scoped_refptr<MediaStreamTrack> at(size_t index);
+    virtual MediaStreamTrack* at(size_t index);
 
     // Implement Notifier
     virtual void RegisterObserver(Observer* observer);
@@ -70,7 +70,7 @@ class MediaStreamProxy : public LocalMediaStream,
 
   // Implement MediaStream.
   virtual const std::string& label();
-  virtual scoped_refptr<MediaStreamTrackList> tracks();
+  virtual MediaStreamTrackList* tracks();
   virtual ReadyState ready_state();
   virtual void set_ready_state(ReadyState new_state);
 

third_party_mods/libjingle/source/talk/session/phone/channel.h

@@ -91,6 +91,8 @@ class BaseChannel
               const std::string& content_name,
               TransportChannel* transport_channel);
   virtual ~BaseChannel();
+  bool Init(TransportChannel* /*transport_channel*/,
+            TransportChannel* /*rtcp_transport_channel*/) {return true;}
 
   talk_base::Thread* worker_thread() const { return worker_thread_; }
   BaseSession* session() const { return session_; }
@@ -295,6 +297,7 @@ class VoiceChannel : public BaseChannel {
                VoiceMediaChannel *channel, BaseSession *session,
                const std::string& content_name, bool rtcp);
   ~VoiceChannel();
+  bool Init() {return true;}
 
   // downcasts a MediaChannel
   virtual VoiceMediaChannel* media_channel() const {
@@ -427,6 +430,8 @@ class VideoChannel : public BaseChannel {
                const std::string& content_name, bool rtcp,
                VoiceChannel *voice_channel);
   ~VideoChannel();
+  bool Init() {return true;}
+
 
   // downcasts a MediaChannel
   virtual VideoMediaChannel* media_channel() const {