Revert 185114

DEPS change introduces new static initializers, which is forbidden.

It's causing failures in checks that look at how many static
initializers chrome has.
http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/46069

> Roll libjingle r281:r286
> 
> BUG=172316,177139
> 
> Review URL: https://codereview.chromium.org/12382004

TBR=hclam@google.com
Review URL: https://codereview.chromium.org/12388009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185129 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 19 insertions, 7 deletions

diff --git a/DEPS b/DEPS
index c7374e6..7553168 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,7 @@ vars = {
   "nacl_tools_revision": "10001",  # native_client/DEPS: tools_rev
   "gtm_revision": "578",
 
-  "libjingle_revision": "286",
+  "libjingle_revision": "284",
   "libphonenumber_revision": "456",
   "libvpx_revision": "180104",
   "lss_revision": "17",
@@ -37,7 +37,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling WebRTC
   # and V8 without interference from each other.
-  "webrtc_revision": "3561",
+  "webrtc_revision": "3501",
   "jsoncpp_revision": "248",
   "nss_revision": "182578",
   # Three lines of non-changing comments so that
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index af3177f..79fb8c5 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -74,6 +74,14 @@ class MockMediaStream : public webrtc::MediaStreamInterface {
     VideoTrackVector::iterator it = FindTrack(&video_track_vector_, track_id);
     return it == video_track_vector_.end() ? NULL : *it;
   }
+  virtual webrtc::AudioTracks* audio_tracks() OVERRIDE {
+    NOTIMPLEMENTED();
+    return NULL;
+  }
+  virtual webrtc::VideoTracks* video_tracks() OVERRIDE {
+    NOTIMPLEMENTED();
+    return NULL;
+  }
   virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 353f917..a055fcc 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -40,6 +40,10 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
 
   virtual bool GetStats(webrtc::StatsObserver* observer,
                         webrtc::MediaStreamTrackInterface* track) OVERRIDE;
+  virtual ReadyState ready_state() OVERRIDE {
+    NOTIMPLEMENTED();
+    return PeerConnectionInterface::kStable;
+  }
   virtual SignalingState signaling_state() OVERRIDE {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kStable;
@@ -56,9 +60,6 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kIceGatheringNew;
   }
-  virtual void Close() OVERRIDE {
-    NOTIMPLEMENTED();
-  }
 
   virtual const webrtc::SessionDescriptionInterface* local_description()
       const OVERRIDE;
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index e27b619..c16677b 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -140,7 +140,8 @@ void LibjingleStreamTransport::Connect(
   // TODO(sergeyu): Specify correct component ID for the channel.
   channel_.reset(new cricket::P2PTransportChannel(
       "", 0, NULL, port_allocator_));
-  channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
+  channel_->SetIceUfrag(ice_username_fragment_);
+  channel_->SetIcePwd(ice_password_);
   channel_->SignalRequestSignaling.connect(
       this, &LibjingleStreamTransport::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 5aa4220..e3f4cc1 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: unknown
-Revision: 286
+Revision: 284
 License: BSD
 License File: source/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index a6e52fc..2c7dfaf 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -646,6 +646,8 @@
             '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc',
             '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h',
             '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h',
+            '<(libjingle_source)/talk/app/webrtc/peerconnectionproxy.cc',
+            '<(libjingle_source)/talk/app/webrtc/peerconnectionproxy.h',
             '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc',
             '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h',
             '<(libjingle_source)/talk/app/webrtc/statscollector.h',