Roll WebRTC 7546:7549.

jingle/notifier/communicator/connection_settings.cc

 // 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.
 
 #include "jingle/notifier/communicator/connection_settings.h"
 
 #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 "talk/p2p/base/port.h"
-
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/p2p/base/port.h"
 
 namespace notifier {
 
 const uint16 kSslTcpPort = 443;
 
 ConnectionSettings::ConnectionSettings(
     const rtc::SocketAddress& server,
     SslTcpMode ssltcp_mode,
     SslTcpSupport ssltcp_support)
     : server(server),
@@ skipping 68 matching lines @@
       }
     } else {
       settings_list.push_back(settings);
     }
   }
 
   return settings_list;
 }
 
 }  // namespace notifier