Revert "Roll WebRTC 7546:7549."

This reverts commit 4e40bbe.

Appears to cause timeouts on Mac 10.6/10.7 tests.

BUG=N/A

Review URL: https://codereview.chromium.org/688723002

Cr-Commit-Position: refs/heads/master@{#301911}

DEPS

@@ -220,7 +220,7 @@ deps = {
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '4bc3dc1af71c98bb257fba5e442303f68b4ff8fc',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '5910fdfb2ca4b12096bdc5c64aee0afc7f93d426', # from svn revision 7549
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'c103da3cd4f12eb017c74963eeaf2204cb9ed5eb', # from svn revision 7546
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14',
@@ -244,7 +244,7 @@ deps = {
    Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '1a02faa335e7d8076b5cf8dd9a584e72669b0c8e', # from svn revision 7549
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '4f2aa0829e4e69972202efb7de2f53cc8858e2c9', # from svn revision 7546
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),

components/invalidation/DEPS

@@ -18,5 +18,5 @@ include_rules = [
   "+net/url_request",
 
   # invalidation_notifier depends on the xmpp part of libjingle.
-  "+webrtc/libjingle/xmpp",
+  "+talk/xmpp",
 ]

components/invalidation/invalidation_notifier.cc

@@ -12,8 +12,8 @@
 #include "google/cacheinvalidation/include/invalidation-client-factory.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
-#include "webrtc/libjingle/xmpp/jid.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "talk/xmpp/jid.h"
+#include "talk/xmpp/xmppclientsettings.h"
 
 namespace syncer {
 

content/browser/renderer_host/p2p/socket_host.cc

@@ -12,10 +12,10 @@
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/hmac.h"
+#include "third_party/libjingle/source/talk/p2p/base/stun.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/messagedigest.h"
-#include "third_party/webrtc/p2p/base/stun.h"
 
 namespace {
 

content/renderer/p2p/ipc_socket_factory.h

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
-#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
+#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace content {
 

content/renderer/p2p/port_allocator.h

@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 #define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 
-#include "third_party/webrtc/p2p/client/basicportallocator.h"
+#include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
 
 namespace content {
 

jingle/glue/channel_socket_adapter.cc

@@ -11,7 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "third_party/webrtc/p2p/base/transportchannel.h"
+#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
 
 namespace jingle_glue {
 

jingle/glue/channel_socket_adapter_unittest.cc

@@ -11,7 +11,7 @@
 #include "net/socket/socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/webrtc/p2p/base/transportchannel.h"
+#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
 
 using net::IOBuffer;
 

jingle/glue/chrome_async_socket.h

@@ -21,7 +21,7 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "third_party/webrtc/libjingle/xmpp/asyncsocket.h"
+#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
 
 namespace net {
 class IOBufferWithSize;

jingle/glue/pseudotcp_adapter.h

@@ -12,7 +12,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_socket.h"
-#include "third_party/webrtc/p2p/base/pseudotcp.h"
+#include "third_party/libjingle/source/talk/p2p/base/pseudotcp.h"
 
 namespace jingle_glue {
 

jingle/glue/utils.cc

@@ -11,9 +11,9 @@
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
+#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/socketaddress.h"
-#include "third_party/webrtc/p2p/base/candidate.h"
 
 namespace jingle_glue {
 

jingle/notifier/base/fake_base_task.cc

@@ -5,8 +5,8 @@
 #include "base/compiler_specific.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
+#include "talk/xmpp/asyncsocket.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "webrtc/libjingle/xmpp/asyncsocket.h"
 
 namespace notifier {
 

jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/saslcookiemechanism.h"
 #include "webrtc/base/socketaddress.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/saslcookiemechanism.h"
 
 namespace notifier {
 

jingle/notifier/base/gaia_token_pre_xmpp_auth.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "webrtc/libjingle/xmpp/prexmppauth.h"
+#include "talk/xmpp/prexmppauth.h"
 
 namespace notifier {
 

jingle/notifier/base/notifier_options_util.cc

@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/jid.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/jid.h"
 
 namespace notifier {
 

jingle/notifier/base/notifier_options_util.h

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "jingle/notifier/base/server_information.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/base/weak_xmpp_client.h

@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "webrtc/libjingle/xmpp/xmppclient.h"
+#include "talk/xmpp/xmppclient.h"
 
 namespace rtc {
 class TaskParent;

jingle/notifier/base/xmpp_connection.cc

@@ -15,7 +15,7 @@
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request_context.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/base/xmpp_connection.h

@@ -14,8 +14,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "talk/xmpp/xmppengine.h"
 #include "webrtc/base/sigslot.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class PreXmppAuth;

jingle/notifier/base/xmpp_connection_unittest.cc

@@ -18,10 +18,10 @@
 #include "net/cert/cert_verifier.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
+#include "talk/xmpp/prexmppauth.h"
+#include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/libjingle/xmpp/prexmppauth.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace buzz {
 class CaptchaChallenge;

jingle/notifier/communicator/DEPS

@@ -1,4 +1,4 @@
 include_rules = [
   # Need for cricket::ProtocolType.
-  "+webrtc/p2p/base/port.h",
+  "+talk/p2p/base/port.h",
 ]

jingle/notifier/communicator/connection_settings.cc

@@ -6,11 +6,12 @@
 
 #include "base/logging.h"
 
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 // Ideally we shouldn't include anything from talk/p2p, but we need
 // the definition of ProtocolType.  Don't use any functions from
 // port.h, since it won't link.
-#include "webrtc/p2p/base/port.h"
+#include "talk/p2p/base/port.h"
+
+#include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/communicator/login.cc

@@ -10,17 +10,17 @@
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
+#include "talk/xmpp/asyncsocket.h"
+#include "talk/xmpp/prexmppauth.h"
+#include "talk/xmpp/xmppclient.h"
+#include "talk/xmpp/xmppclientsettings.h"
+#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/firewallsocketserver.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/taskrunner.h"
-#include "webrtc/libjingle/xmpp/asyncsocket.h"
-#include "webrtc/libjingle/xmpp/prexmppauth.h"
-#include "webrtc/libjingle/xmpp/xmppclient.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 

jingle/notifier/communicator/login.h

@@ -17,7 +17,7 @@
 #include "jingle/notifier/communicator/login_settings.h"
 #include "jingle/notifier/communicator/single_login_attempt.h"
 #include "net/base/network_change_notifier.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "talk/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppClient;

jingle/notifier/communicator/login_settings.h

@@ -10,7 +10,7 @@
 #include "base/time/time.h"
 #include "jingle/notifier/base/server_information.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/communicator/login_settings_unittest.cc

@@ -6,8 +6,8 @@
 
 #include <cstddef>
 
+#include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/communicator/single_login_attempt.cc

@@ -14,9 +14,9 @@
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "jingle/notifier/listener/xml_element_util.h"
 #include "net/base/host_port_pair.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppclientsettings.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 

jingle/notifier/communicator/single_login_attempt.h

@@ -10,7 +10,7 @@
 #include "jingle/notifier/base/xmpp_connection.h"
 #include "jingle/notifier/communicator/connection_settings.h"
 #include "jingle/notifier/communicator/login_settings.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "talk/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppTaskParentInterface;

jingle/notifier/communicator/single_login_attempt_unittest.cc

@@ -14,10 +14,10 @@
 #include "jingle/notifier/communicator/login_settings.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/url_request/url_request_test_util.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppengine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppTaskParentInterface;

jingle/notifier/listener/push_notifications_listen_task.cc

@@ -9,12 +9,12 @@
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "jingle/notifier/listener/xml_element_util.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppclient.h"
+#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/task.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/xmppclient.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 

jingle/notifier/listener/push_notifications_listen_task.h

@@ -14,7 +14,7 @@
 #define JINGLE_NOTIFIER_PUSH_NOTIFICATIONS_LISTENER_LISTEN_TASK_H_
 
 #include "base/compiler_specific.h"
-#include "webrtc/libjingle/xmpp/xmpptask.h"
+#include "talk/xmpp/xmpptask.h"
 
 namespace buzz {
 class XmlElement;

jingle/notifier/listener/push_notifications_send_update_task.cc

@@ -11,11 +11,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/xml_element_util.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/jid.h"
+#include "talk/xmpp/xmppclient.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/jid.h"
-#include "webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace notifier {
 

jingle/notifier/listener/push_notifications_send_update_task.h

@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
-#include "webrtc/libjingle/xmpp/xmpptask.h"
+#include "talk/xmpp/xmpptask.h"
 
 namespace buzz {
 class Jid;

jingle/notifier/listener/push_notifications_send_update_task_unittest.cc

@@ -8,8 +8,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "jingle/notifier/listener/xml_element_util.h"
+#include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/libjingle/xmpp/jid.h"
 
 namespace buzz {
 class XmlElement;

jingle/notifier/listener/push_notifications_subscribe_task.cc

@@ -10,12 +10,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/xml_element_util.h"
+#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppclient.h"
+#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/task.h"
-#include "webrtc/libjingle/xmpp/constants.h"
-#include "webrtc/libjingle/xmpp/xmppclient.h"
-#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 

jingle/notifier/listener/push_notifications_subscribe_task.h

@@ -13,8 +13,8 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
+#include "talk/xmpp/xmpptask.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
-#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace notifier {
 class PushNotificationsSubscribeTask : public buzz::XmppTask {