Revert 164326 - Revert 164322 - Roll webrtc from 2961 to 2985, deps2git from 157441 to 163971

reland 164322

TBR=niklase
Review URL: https://codereview.chromium.org/11314003

[email protected]
Review URL: https://codereview.chromium.org/11315006

[email protected]
Review URL: https://codereview.chromium.org/11313009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164343 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index 148bd715..7c4f668a 100644
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@
   # 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": "2961",
+  "webrtc_revision": "2985",
   "jsoncpp_revision": "248",
   "nss_revision": "164196",
 }
@@ -275,7 +275,7 @@
         Var("nacl_tools_revision"),
 
   "src/third_party/webrtc":
-    (Var("googlecode_url") % "webrtc") + "/stable/src@" + Var("webrtc_revision"),
+    (Var("googlecode_url") % "webrtc") + "/stable/webrtc@" + Var("webrtc_revision"),
 
   "src/third_party/jsoncpp/source/include":
     (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
@@ -311,7 +311,7 @@
     "/trunk/deps/third_party/undoview@119694",
 
   "src/tools/deps2git":
-    "/trunk/tools/deps2git@157441",
+    "/trunk/tools/deps2git@163971",
 
   "src/third_party/webpagereplay":
     (Var("googlecode_url") % "web-page-replay") + "/trunk@501",