File chromium-7.0.542.0-system-libjingle.patch of Package chromium
diff -up chromium-7.0.542.0/build/linux/system.gyp.jingle chromium-7.0.542.0/build/linux/system.gyp
--- chromium-7.0.542.0/src/build/linux/system.gyp.jingle 2010-10-05 17:21:58.638364791 -0400
+++ chromium-7.0.542.0/src/build/linux/system.gyp 2010-10-05 17:23:04.688497228 -0400
@@ -289,6 +289,86 @@
}]]
},
{
+ 'target_name': 'jingle',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags jinglebase-0.4)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other jinglebase-0.4)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l jinglebase-0.4)',
+ ],
+ },
+ }]]
+ },
+ {
+ 'target_name': 'jinglep2p',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags jinglep2p-0.4)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other jinglep2p-0.4)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l jinglep2p-0.4)',
+ ],
+ },
+ }]]
+ },
+ {
+ 'target_name': 'jinglesessionphone',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags jinglesessionphone-0.4)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other jinglesessionphone-0.4)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l jinglesessionphone-0.4)',
+ ],
+ },
+ }]]
+ },
+ {
+ 'target_name': 'jinglesessiontunnel',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags jinglesessiontunnel-0.4)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other jinglesessiontunnel-0.4)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l jinglesessiontunnel-0.4)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome-keyring',
'type': 'settings',
'conditions': [
diff -up chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc.jingle chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc
--- chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc.jingle 2010-10-04 05:42:27.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc 2010-10-05 17:21:58.886231001 -0400
@@ -8,7 +8,7 @@
#include <vector>
#include "chrome/browser/autofill/autofill_type.h"
-#include "third_party/libjingle/overrides/talk/xmllite/qname.h"
+#include <talk/xmllite/qname.h>
AutoFillXmlParser::AutoFillXmlParser()
: succeeded_(true) {
diff -up chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h.jingle chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h
--- chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h.jingle 2010-10-05 17:21:58.840244180 -0400
+++ chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h 2010-10-05 17:21:58.887231050 -0400
@@ -12,7 +12,7 @@
#include "chrome/browser/autofill/field_types.h"
#include "chrome/browser/autofill/form_structure.h"
#include <expat.h>
-#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
+#include <talk/xmllite/xmlparser.h>
// The base class that contains common functionality between
// AutoFillQueryXmlParser and AutoFillUploadXmlParser.
diff -up chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc.jingle chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc
--- chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc.jingle 2010-10-04 05:42:27.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc 2010-10-05 17:21:58.888230747 -0400
@@ -8,7 +8,7 @@
#include "chrome/browser/autofill/autofill_xml_parser.h"
#include "chrome/browser/autofill/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
+#include <talk/xmllite/xmlparser.h>
namespace {
diff -up chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc.jingle chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc
--- chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc.jingle 2010-10-04 05:42:27.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc 2010-10-05 17:21:58.889230853 -0400
@@ -12,7 +12,7 @@
#include "chrome/browser/autofill/autofill_xml_parser.h"
#include "chrome/browser/autofill/field_types.h"
#include "chrome/browser/autofill/form_field.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
+#include <talk/xmllite/xmlelement.h>
#include "webkit/glue/form_field.h"
using webkit_glue::FormData;
diff -up chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.cc.jingle chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.cc
--- chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.cc.jingle 2010-10-04 05:42:35.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.cc 2010-10-05 17:21:58.890230871 -0400
@@ -32,7 +32,7 @@
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request_status.h"
-#include "third_party/libjingle/source/talk/base/urlencode.h"
+#include <talk/base/urlencode.h>
using base::Time;
using base::TimeDelta;
diff -up chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc.jingle chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc
--- chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc.jingle 2010-10-04 05:42:35.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc 2010-10-05 17:21:58.891365245 -0400
@@ -65,7 +65,7 @@ class CacheInvalidationListenTask : publ
}
// Acknowledge receipt of the iq to the buzz server.
// TODO(akalin): Send an error response for malformed packets.
- scoped_ptr<buzz::XmlElement> response_stanza(MakeIqResult(stanza));
+ talk_base::jingle_scoped_ptr<buzz::XmlElement> response_stanza(MakeIqResult(stanza));
SendStanza(response_stanza.get());
return STATE_RESPONSE;
}
@@ -108,7 +108,7 @@ class CacheInvalidationListenTask : publ
return true;
}
- scoped_ptr<Callback1<const std::string&>::Type> callback_;
+ talk_base::jingle_scoped_ptr<Callback1<const std::string&>::Type> callback_;
DISALLOW_COPY_AND_ASSIGN(CacheInvalidationListenTask);
};
@@ -125,7 +125,7 @@ class CacheInvalidationSendMessageTask :
virtual ~CacheInvalidationSendMessageTask() {}
virtual int ProcessStart() {
- scoped_ptr<buzz::XmlElement> stanza(
+ talk_base::jingle_scoped_ptr<buzz::XmlElement> stanza(
MakeCacheInvalidationIqPacket(to_jid_, task_id(), msg_,
seq_, sid_));
VLOG(1) << "Sending message: "
diff -up chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp.jingle chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp
--- chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp.jingle 2010-10-04 05:42:35.000000000 -0400
+++ chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp 2010-10-05 17:21:58.892363130 -0400
@@ -20,7 +20,7 @@
'<(DEPTH)/chrome/chrome.gyp:common_constants',
'<(DEPTH)/chrome/chrome.gyp:sync_notifier',
'<(DEPTH)/jingle/jingle.gyp:notifier',
- '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle',
+ '<(DEPTH)/build/linux/system.gyp:jingle',
],
},
],
diff -up chromium-7.0.542.0/chrome/chrome_browser.gypi.jingle chromium-7.0.542.0/chrome/chrome_browser.gypi
--- chromium-7.0.542.0/chrome/chrome_browser.gypi.jingle 2010-10-05 17:21:58.724488357 -0400
+++ chromium-7.0.542.0/chrome/chrome_browser.gypi 2010-10-05 17:21:58.896371788 -0400
@@ -32,7 +32,7 @@
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/expat/expat.gyp:expat',
'../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
diff -up chromium-7.0.542.0/chrome/chrome_common.gypi.jingle chromium-7.0.542.0/chrome/chrome_common.gypi
--- chromium-7.0.542.0/chrome/chrome_common.gypi.jingle 2010-10-05 17:21:58.725487566 -0400
+++ chromium-7.0.542.0/chrome/chrome_common.gypi 2010-10-05 17:21:58.896371788 -0400
@@ -453,6 +453,7 @@
'../base/base.gyp:base',
'../net/net.gyp:net_resources',
'../net/net.gyp:net',
+ '../build/linux/system.gyp:jingle',
],
},
],
diff -up chromium-7.0.542.0/chrome/chrome.gyp.jingle chromium-7.0.542.0/chrome/chrome.gyp
--- chromium-7.0.542.0/chrome/chrome.gyp.jingle 2010-10-05 17:21:58.804245818 -0400
+++ chromium-7.0.542.0/chrome/chrome.gyp 2010-10-05 17:21:58.900367088 -0400
@@ -859,7 +859,7 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../jingle/jingle.gyp:notifier',
'../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
'../third_party/sqlite/sqlite.gyp:sqlite',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
'common_constants',
@@ -1018,7 +1018,7 @@
],
'dependencies': [
'../skia/skia.gyp:skia',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
# TODO(akalin): Change back to protobuf_lite once it supports
# preserving unknown fields.
@@ -1100,7 +1100,7 @@
'../base/base.gyp:base',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
],
'sources': [
'service/service_child_process_host.cc',
diff -up chromium-7.0.542.0/chrome/chrome_tests.gypi.jingle chromium-7.0.542.0/chrome/chrome_tests.gypi
--- chromium-7.0.542.0/chrome/chrome_tests.gypi.jingle 2010-10-05 17:21:58.649369490 -0400
+++ chromium-7.0.542.0/chrome/chrome_tests.gypi 2010-10-05 17:21:58.902366104 -0400
@@ -941,7 +941,7 @@
'../third_party/cld/cld.gyp:cld',
'../third_party/expat/expat.gyp:expat',
'../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
@@ -2498,7 +2498,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
'profile_import',
'syncapi',
'sync_notifier',
diff -up chromium-7.0.542.0/chrome/common/net/gaia/gaia_authenticator2.cc.jingle chromium-7.0.542.0/chrome/common/net/gaia/gaia_authenticator2.cc
--- chromium-7.0.542.0/chrome/common/net/gaia/gaia_authenticator2.cc.jingle 2010-10-04 05:42:42.000000000 -0400
+++ chromium-7.0.542.0/chrome/common/net/gaia/gaia_authenticator2.cc 2010-10-05 17:21:58.903365151 -0400
@@ -16,7 +16,7 @@
#include "chrome/common/net/url_request_context_getter.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_status.h"
-#include "third_party/libjingle/source/talk/base/urlencode.h"
+#include <talk/base/urlencode.h>
// TODO(chron): Add sourceless version of this formatter.
// static
diff -up chromium-7.0.542.0/jingle/jingle.gyp.jingle chromium-7.0.542.0/jingle/jingle.gyp
--- chromium-7.0.542.0/jingle/jingle.gyp.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/jingle.gyp 2010-10-05 17:21:58.903365151 -0400
@@ -78,10 +78,10 @@
'../base/base.gyp:base',
'../net/net.gyp:net',
'../third_party/expat/expat.gyp:expat',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
],
'export_dependent_settings': [
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
],
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -118,7 +118,7 @@
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../build/linux/system.gyp:jingle',
],
# TODO(akalin): Remove this once we have our own test suite and
# runner.
diff -up chromium-7.0.542.0/jingle/notifier/base/chrome_async_socket.h.jingle chromium-7.0.542.0/jingle/notifier/base/chrome_async_socket.h
--- chromium-7.0.542.0/jingle/notifier/base/chrome_async_socket.h.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/base/chrome_async_socket.h 2010-10-05 17:21:58.904391267 -0400
@@ -7,6 +7,8 @@
#ifndef JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
#define JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
+#include <talk/config.h>
+
#if !defined(FEATURE_ENABLE_SSL)
#error ChromeAsyncSocket expects FEATURE_ENABLE_SSL to be defined
#endif
diff -up chromium-7.0.542.0/jingle/notifier/communicator/login_settings.h.jingle chromium-7.0.542.0/jingle/notifier/communicator/login_settings.h
--- chromium-7.0.542.0/jingle/notifier/communicator/login_settings.h.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/communicator/login_settings.h 2010-10-05 17:21:58.904391267 -0400
@@ -72,13 +72,13 @@ class LoginSettings {
bool try_ssltcp_first_;
net::HostResolver* host_resolver_;
- talk_base::scoped_array<ServerInformation> server_list_;
+ talk_base::jingle_scoped_array<ServerInformation> server_list_;
int server_count_;
// Used to handle redirects
- scoped_ptr<ServerInformation> server_override_;
+ talk_base::jingle_scoped_ptr<ServerInformation> server_override_;
- scoped_ptr<buzz::XmppClientSettings> user_settings_;
- scoped_ptr<ConnectionOptions> connection_options_;
+ talk_base::jingle_scoped_ptr<buzz::XmppClientSettings> user_settings_;
+ talk_base::jingle_scoped_ptr<ConnectionOptions> connection_options_;
DISALLOW_COPY_AND_ASSIGN(LoginSettings);
};
} // namespace notifier
diff -up chromium-7.0.542.0/jingle/notifier/communicator/xmpp_connection_generator.h.jingle chromium-7.0.542.0/jingle/notifier/communicator/xmpp_connection_generator.h
--- chromium-7.0.542.0/jingle/notifier/communicator/xmpp_connection_generator.h.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/communicator/xmpp_connection_generator.h 2010-10-05 17:21:58.905365479 -0400
@@ -66,12 +66,12 @@ class XmppConnectionGenerator : public s
void HandleExhaustedConnections();
net::SingleRequestHostResolver host_resolver_;
- scoped_ptr<net::CompletionCallback> resolve_callback_;
+ talk_base::jingle_scoped_ptr<net::CompletionCallback> resolve_callback_;
net::AddressList address_list_;
net::BoundNetLog bound_net_log_;
- talk_base::scoped_ptr<ConnectionSettingsList> settings_list_;
+ talk_base::jingle_scoped_ptr<ConnectionSettingsList> settings_list_;
int settings_index_; // The setting that is currently being used.
- talk_base::scoped_array<ServerInformation> server_list_;
+ talk_base::jingle_scoped_array<ServerInformation> server_list_;
int server_count_;
int server_index_; // The server that is current being used.
bool try_ssltcp_first_; // Used when sync tests are run on chromium builders.
diff -up chromium-7.0.542.0/jingle/notifier/listener/listen_task.cc.jingle chromium-7.0.542.0/jingle/notifier/listener/listen_task.cc
--- chromium-7.0.542.0/jingle/notifier/listener/listen_task.cc.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/listener/listen_task.cc 2010-10-05 17:21:58.906365071 -0400
@@ -35,7 +35,7 @@ int ListenTask::ProcessResponse() {
return STATE_BLOCKED;
}
// Acknowledge receipt of the notification to the buzz server.
- scoped_ptr<buzz::XmlElement> response_stanza(MakeIqResult(stanza));
+ talk_base::jingle_scoped_ptr<buzz::XmlElement> response_stanza(MakeIqResult(stanza));
SendStanza(response_stanza.get());
// TODO(akalin): Write unittests to cover this.
diff -up chromium-7.0.542.0/jingle/notifier/listener/push_notifications_subscribe_task.cc.jingle chromium-7.0.542.0/jingle/notifier/listener/push_notifications_subscribe_task.cc
--- chromium-7.0.542.0/jingle/notifier/listener/push_notifications_subscribe_task.cc.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/listener/push_notifications_subscribe_task.cc 2010-10-05 17:21:58.915118668 -0400
@@ -39,7 +39,7 @@ bool PushNotificationsSubscribeTask::Han
int PushNotificationsSubscribeTask::ProcessStart() {
LOG(INFO) << "Push notifications: Subscription task started.";
- scoped_ptr<buzz::XmlElement> iq_stanza(
+ talk_base::jingle_scoped_ptr<buzz::XmlElement> iq_stanza(
MakeSubscriptionMessage(channels_list_, GetClient()->jid(),
task_id()));
std::string stanza_str = XmlElementToString(*iq_stanza.get());
diff -up chromium-7.0.542.0/jingle/notifier/listener/subscribe_task.cc.jingle chromium-7.0.542.0/jingle/notifier/listener/subscribe_task.cc
--- chromium-7.0.542.0/jingle/notifier/listener/subscribe_task.cc.jingle 2010-10-04 05:41:33.000000000 -0400
+++ chromium-7.0.542.0/jingle/notifier/listener/subscribe_task.cc 2010-10-05 17:21:58.906365071 -0400
@@ -37,7 +37,7 @@ bool SubscribeTask::HandleStanza(const b
int SubscribeTask::ProcessStart() {
LOG(INFO) << "P2P: Subscription task started.";
- scoped_ptr<buzz::XmlElement> iq_stanza(
+ talk_base::jingle_scoped_ptr<buzz::XmlElement> iq_stanza(
MakeSubscriptionMessage(subscribed_services_list_,
GetClient()->jid().BareJid(), task_id()));
LOG(INFO) << "P2P: Subscription stanza: "
diff -up chromium-7.0.542.0/remoting/remoting.gyp.jingle chromium-7.0.542.0/remoting/remoting.gyp
--- chromium-7.0.542.0/remoting/remoting.gyp.jingle 2010-10-04 05:39:56.000000000 -0400
+++ chromium-7.0.542.0/remoting/remoting.gyp 2010-10-05 17:24:30.894117682 -0400
@@ -297,13 +297,17 @@
'type': '<(library)',
'dependencies': [
'../jingle/jingle.gyp:notifier',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
+ '../build/linux/system.gyp:jingle',
+ '../build/linux/system.gyp:jinglep2p',
+ '../build/linux/system.gyp:jinglesessionphone',
+ '../build/linux/system.gyp:jinglesessiontunnel',
'../third_party/libsrtp/libsrtp.gyp:libsrtp',
],
'export_dependent_settings': [
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
+ '../build/linux/system.gyp:jingle',
+ '../build/linux/system.gyp:jinglep2p',
+ '../build/linux/system.gyp:jinglesessionphone',
+ '../build/linux/system.gyp:jinglesessiontunnel',
],
'sources': [
'jingle_glue/channel_socket_adapter.cc',
diff -up chromium-7.0.542.0/remoting/host/heartbeat_sender.cc.jingle chromium-7.0.542.0/remoting/host/heartbeat_sender.cc
--- chromium-7.0.542.0/remoting/host/heartbeat_sender.cc.jingle 2010-10-04 05:39:56.000000000 -0400
+++ chromium-7.0.542.0/remoting/host/heartbeat_sender.cc 2010-10-05 17:28:01.657125201 -0400
@@ -13,8 +13,8 @@
#include "remoting/jingle_glue/iq_request.h"
#include "remoting/jingle_glue/jingle_client.h"
#include "remoting/jingle_glue/jingle_thread.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
+#include <talk/xmllite/xmlelement.h>
+#include <talk/xmpp/constants.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/host/heartbeat_sender_unittest.cc.jingle chromium-7.0.542.0/remoting/host/heartbeat_sender_unittest.cc
--- chromium-7.0.542.0/remoting/host/heartbeat_sender_unittest.cc.jingle 2010-10-04 05:39:56.000000000 -0400
+++ chromium-7.0.542.0/remoting/host/heartbeat_sender_unittest.cc 2010-10-05 17:28:01.657125201 -0400
@@ -17,8 +17,8 @@
#include "remoting/jingle_glue/jingle_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
+#include <talk/xmllite/xmlelement.h>
+#include <talk/xmpp/constants.h>
using testing::_;
using testing::DeleteArg;
diff -up chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.cc
--- chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.cc 2010-10-05 17:28:01.658119591 -0400
@@ -11,7 +11,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "remoting/jingle_glue/utils.h"
-#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
+#include <talk/p2p/base/transportchannel.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.h.jingle chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.h
--- chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter.h 2010-10-05 17:28:01.658119591 -0400
@@ -6,8 +6,8 @@
#define REMOTING_JINGLE_GLUE_CHANNEL_SOCKET_ADAPTER_H_
#include "net/socket/socket.h"
-#include "third_party/libjingle/source/talk/base/socketaddress.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
+#include <talk/base/socketaddress.h>
+#include <talk/base/sigslot.h>
namespace cricket {
class TransportChannel;
diff -up chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter_unittest.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter_unittest.cc
--- chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter_unittest.cc.jingle 2010-10-05 22:24:55.712504338 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/channel_socket_adapter_unittest.cc 2010-10-05 22:25:07.436505140 -0400
@@ -11,7 +11,7 @@
#include "remoting/jingle_glue/channel_socket_adapter.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
+#include <talk/p2p/base/transportchannel.h>
using net::IOBuffer;
diff -up chromium-7.0.542.0/remoting/jingle_glue/iq_request.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/iq_request.cc
--- chromium-7.0.542.0/remoting/jingle_glue/iq_request.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/iq_request.cc 2010-10-05 17:28:01.659126853 -0400
@@ -8,8 +8,8 @@
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
#include "remoting/jingle_glue/jingle_client.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
+#include <talk/xmpp/constants.h>
+#include <talk/xmpp/xmppengine.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/iq_request.h.jingle chromium-7.0.542.0/remoting/jingle_glue/iq_request.h
--- chromium-7.0.542.0/remoting/jingle_glue/iq_request.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/iq_request.h 2010-10-05 17:28:01.659126853 -0400
@@ -9,7 +9,8 @@
#include "base/callback.h"
#include "base/gtest_prod_util.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
+#include "base/scoped_ptr.h"
+#include <talk/xmpp/xmppengine.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/iq_request_unittest.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/iq_request_unittest.cc
--- chromium-7.0.542.0/remoting/jingle_glue/iq_request_unittest.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/iq_request_unittest.cc 2010-10-05 17:28:01.659126853 -0400
@@ -8,7 +8,7 @@
#include "remoting/jingle_glue/iq_request.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
+#include <talk/xmllite/xmlelement.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.cc
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.cc 2010-10-05 17:28:01.660117898 -0400
@@ -10,7 +10,7 @@
#include "base/waitable_event.h"
#include "media/base/data_buffer.h"
#include "remoting/jingle_glue/jingle_thread.h"
-#include "third_party/libjingle/source/talk/base/stream.h"
+#include <talk/base/stream.h>
using media::DataBuffer;
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.h.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.h
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_channel.h 2010-10-05 17:28:01.660117898 -0400
@@ -15,7 +15,7 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
+#include <talk/base/sigslot.h>
namespace base {
class WaitableEvent;
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_channel_unittest.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_channel_unittest.cc
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_channel_unittest.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_channel_unittest.cc 2010-10-05 17:28:01.661125237 -0400
@@ -10,7 +10,7 @@
#include "remoting/jingle_glue/mock_objects.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/base/stream.h"
+#include <talk/base/stream.h>
using testing::_;
using testing::Return;
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_client.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_client.cc
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_client.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_client.cc 2010-10-05 17:28:01.661125237 -0400
@@ -11,14 +11,14 @@
#include "remoting/jingle_glue/jingle_thread.h"
#include "remoting/jingle_glue/relay_port_allocator.h"
#include "remoting/jingle_glue/xmpp_socket_adapter.h"
-#include "third_party/libjingle/source/talk/base/asyncsocket.h"
-#include "third_party/libjingle/source/talk/base/ssladapter.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h"
-#include "third_party/libjingle/source/talk/p2p/base/transport.h"
-#include "third_party/libjingle/source/talk/p2p/client/sessionmanagertask.h"
-#include "third_party/libjingle/source/talk/session/tunnel/tunnelsessionclient.h"
-#include "third_party/libjingle/source/talk/xmpp/prexmppauth.h"
-#include "third_party/libjingle/source/talk/xmpp/saslcookiemechanism.h"
+#include <talk/base/asyncsocket.h>
+#include <talk/base/ssladapter.h>
+#include <talk/p2p/base/sessionmanager.h>
+#include <talk/p2p/base/transport.h>
+#include <talk/p2p/client/sessionmanagertask.h>
+#include <talk/session/tunnel/tunnelsessionclient.h>
+#include <talk/xmpp/prexmppauth.h>
+#include <talk/xmpp/saslcookiemechanism.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_client.h.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_client.h
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_client.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_client.h 2010-10-05 17:28:01.661125237 -0400
@@ -8,7 +8,7 @@
#include <string>
#include "remoting/jingle_glue/jingle_channel.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
+#include <talk/xmpp/xmppclient.h>
class MessageLoop;
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.cc
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.cc 2010-10-05 17:28:01.662491797 -0400
@@ -5,9 +5,9 @@
#include "remoting/jingle_glue/jingle_info_task.h"
#include "base/scoped_ptr.h"
-#include "third_party/libjingle/source/talk/base/socketaddress.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
+#include <talk/base/socketaddress.h>
+#include <talk/xmpp/constants.h>
+#include <talk/xmpp/xmppclient.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.h.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.h
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_info_task.h 2010-10-05 17:28:01.662491797 -0400
@@ -8,10 +8,10 @@
#include <vector>
#include <string>
-#include "third_party/libjingle/source/talk/base/sigslot.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
-#include "third_party/libjingle/source/talk/xmpp/xmpptask.h"
+#include <talk/base/sigslot.h>
+#include <talk/p2p/client/httpportallocator.h>
+#include <talk/xmpp/xmppengine.h>
+#include <talk/xmpp/xmpptask.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.cc
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.cc 2010-10-05 17:28:01.663485428 -0400
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/message_pump.h"
#include "base/time.h"
-#include "third_party/libjingle/source/talk/base/ssladapter.h"
+#include <talk/base/ssladapter.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.h.jingle chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.h
--- chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/jingle_thread.h 2010-10-05 17:28:01.663485428 -0400
@@ -8,9 +8,9 @@
#include "base/message_loop.h"
#include "base/tracked_objects.h"
#include "base/waitable_event.h"
-#include "third_party/libjingle/source/talk/base/messagequeue.h"
-#include "third_party/libjingle/source/talk/base/taskrunner.h"
-#include "third_party/libjingle/source/talk/base/thread.h"
+#include <talk/base/messagequeue.h>
+#include <talk/base/taskrunner.h>
+#include <talk/base/thread.h>
namespace buzz {
class XmppClient;
diff -up chromium-7.0.542.0/remoting/jingle_glue/mock_objects.h.jingle chromium-7.0.542.0/remoting/jingle_glue/mock_objects.h
--- chromium-7.0.542.0/remoting/jingle_glue/mock_objects.h.jingle 2010-10-05 22:25:35.328506462 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/mock_objects.h 2010-10-05 22:25:46.008500597 -0400
@@ -8,7 +8,7 @@
#include "media/base/data_buffer.h"
#include "remoting/jingle_glue/jingle_channel.h"
#include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/libjingle/source/talk/base/stream.h"
+#include <talk/base/stream.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.cc
--- chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.cc.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.cc 2010-10-05 17:28:01.664489637 -0400
@@ -7,7 +7,7 @@
#include <vector>
#include "remoting/jingle_glue/jingle_info_task.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
+#include <talk/xmpp/xmppclient.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.h.jingle chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.h
--- chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.h.jingle 2010-10-04 05:39:55.000000000 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/relay_port_allocator.h 2010-10-05 17:28:01.664489637 -0400
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "third_party/libjingle/source/talk/base/sigslot.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
+#include <talk/base/sigslot.h>
+#include <talk/p2p/client/httpportallocator.h>
namespace buzz {
class XmppClient;
diff -up chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.cc
--- chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.cc.jingle 2010-10-05 22:24:14.895114801 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.cc 2010-10-05 22:24:28.431125450 -0400
@@ -9,7 +9,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "remoting/jingle_glue/utils.h"
-#include "third_party/libjingle/source/talk/base/stream.h"
+#include <talk/base/stream.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.h.jingle chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.h
--- chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.h.jingle 2010-10-05 22:23:44.438116258 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter.h 2010-10-05 22:24:08.871243842 -0400
@@ -7,7 +7,7 @@
#include "base/scoped_ptr.h"
#include "net/socket/socket.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
+#include <talk/base/sigslot.h>
namespace talk_base {
class StreamInterface;
diff -up chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter_unittest.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter_unittest.cc
--- chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter_unittest.cc.jingle 2010-10-05 22:29:21.598504646 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/stream_socket_adapter_unittest.cc 2010-10-05 22:29:33.740503932 -0400
@@ -12,7 +12,7 @@
#include "remoting/jingle_glue/mock_objects.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
+#include <talk/p2p/base/transportchannel.h>
using net::IOBuffer;
diff -up chromium-7.0.542.0/remoting/jingle_glue/utils.cc.jingle chromium-7.0.542.0/remoting/jingle_glue/utils.cc
--- chromium-7.0.542.0/remoting/jingle_glue/utils.cc.jingle 2010-10-05 22:25:17.686500929 -0400
+++ chromium-7.0.542.0/remoting/jingle_glue/utils.cc 2010-10-05 22:25:27.941500717 -0400
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "net/base/net_errors.h"
-#include "third_party/libjingle/source/talk/base/socket.h"
+#include <talk/base/socket.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.cc.jingle chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.cc
--- chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.cc.jingle 2010-10-05 22:26:01.272499277 -0400
+++ chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.cc 2010-10-05 22:26:28.581505926 -0400
@@ -10,9 +10,9 @@
#include "remoting/jingle_glue/channel_socket_adapter.h"
#include "remoting/jingle_glue/stream_socket_adapter.h"
#include "remoting/protocol/jingle_chromoting_server.h"
-#include "third_party/libjingle/source/talk/base/thread.h"
-#include "third_party/libjingle/source/talk/p2p/base/session.h"
-#include "third_party/libjingle/source/talk/session/tunnel/pseudotcpchannel.h"
+#include <talk/base/thread.h>
+#include <talk/p2p/base/session.h>
+#include <talk/session/tunnel/pseudotcpchannel.h>
using cricket::BaseSession;
using cricket::PseudoTcpChannel;
diff -up chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.h.jingle chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.h
--- chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.h.jingle 2010-10-05 22:28:52.146500872 -0400
+++ chromium-7.0.542.0/remoting/protocol/jingle_chromoting_connection.h 2010-10-05 22:29:08.358502070 -0400
@@ -8,8 +8,8 @@
#include "base/lock.h"
#include "base/ref_counted.h"
#include "remoting/protocol/chromoting_connection.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
-#include "third_party/libjingle/source/talk/p2p/base/session.h"
+#include <talk/base/sigslot.h>
+#include <talk/p2p/base/session.h>
namespace cricket {
class PseudoTcpChannel;
diff -up chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.cc.jingle chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.cc
--- chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.cc.jingle 2010-10-05 22:26:36.474505684 -0400
+++ chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.cc 2010-10-05 22:27:01.851507614 -0400
@@ -6,9 +6,9 @@
#include "base/message_loop.h"
#include "remoting/base/constants.h"
-#include "third_party/libjingle/source/talk/p2p/base/constants.h"
-#include "third_party/libjingle/source/talk/p2p/base/transport.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
+#include <talk/p2p/base/constants.h>
+#include <talk/p2p/base/transport.h>
+#include <talk/xmllite/xmlelement.h>
using cricket::ContentDescription;
using cricket::SessionDescription;
diff -up chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.h.jingle chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.h
--- chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.h.jingle 2010-10-05 22:27:36.016507166 -0400
+++ chromium-7.0.542.0/remoting/protocol/jingle_chromoting_server.h 2010-10-05 22:27:57.648500972 -0400
@@ -12,9 +12,9 @@
#include "base/ref_counted.h"
#include "remoting/protocol/chromoting_server.h"
#include "remoting/protocol/jingle_chromoting_connection.h"
-#include "third_party/libjingle/source/talk/p2p/base/session.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessionclient.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
+#include <talk/p2p/base/session.h>
+#include <talk/p2p/base/sessionclient.h>
+#include <talk/p2p/base/sessiondescription.h>
class MessageLoop;
diff -up chromium-7.0.542.0/remoting/protocol/session_manager_pair.cc.jingle chromium-7.0.542.0/remoting/protocol/session_manager_pair.cc
--- chromium-7.0.542.0/remoting/protocol/session_manager_pair.cc.jingle 2010-10-05 22:28:10.788509388 -0400
+++ chromium-7.0.542.0/remoting/protocol/session_manager_pair.cc 2010-10-05 22:28:37.897506734 -0400
@@ -6,10 +6,10 @@
#include "base/logging.h"
#include "remoting/jingle_glue/jingle_thread.h"
-#include "third_party/libjingle/source/talk/base/network.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h"
-#include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
+#include <talk/base/network.h>
+#include <talk/p2p/base/sessionmanager.h>
+#include <talk/p2p/client/basicportallocator.h>
+#include <talk/xmllite/xmlelement.h>
namespace remoting {
diff -up chromium-7.0.542.0/remoting/protocol/session_manager_pair.h.jingle chromium-7.0.542.0/remoting/protocol/session_manager_pair.h
--- chromium-7.0.542.0/remoting/protocol/session_manager_pair.h.jingle 2010-10-05 22:27:12.785501061 -0400
+++ chromium-7.0.542.0/remoting/protocol/session_manager_pair.h 2010-10-05 22:27:25.304489453 -0400
@@ -13,7 +13,7 @@
#include <base/ref_counted.h>
#include <base/scoped_ptr.h>
-#include "third_party/libjingle/source/talk/base/sigslot.h"
+#include <talk/base/sigslot.h>
class MessageLoop;
