summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autofill/autofill_xml_parser.cc2
-rw-r--r--chrome/browser/autofill/autofill_xml_parser.h2
-rw-r--r--chrome/browser/autofill/autofill_xml_parser_unittest.cc2
-rw-r--r--chrome/browser/autofill/form_structure.cc2
-rw-r--r--chrome/browser/chromeos/login/google_authenticator.cc2
-rw-r--r--chrome/browser/sync/tools/sync_listen_notifications.cc3
6 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/autofill/autofill_xml_parser.cc b/chrome/browser/autofill/autofill_xml_parser.cc
index 2d84fa4..0142799 100644
--- a/chrome/browser/autofill/autofill_xml_parser.cc
+++ b/chrome/browser/autofill/autofill_xml_parser.cc
@@ -8,7 +8,7 @@
#include <vector>
#include "chrome/browser/autofill/autofill_type.h"
-#include "third_party/libjingle/files/talk/xmllite/qname.h"
+#include "third_party/libjingle/overrides/talk/xmllite/qname.h"
AutoFillXmlParser::AutoFillXmlParser()
: succeeded_(true) {
diff --git a/chrome/browser/autofill/autofill_xml_parser.h b/chrome/browser/autofill/autofill_xml_parser.h
index 69c662a..02cb31e 100644
--- a/chrome/browser/autofill/autofill_xml_parser.h
+++ b/chrome/browser/autofill/autofill_xml_parser.h
@@ -11,7 +11,7 @@
#include "chrome/browser/autofill/field_types.h"
#include "chrome/browser/autofill/form_structure.h"
#include "third_party/expat/files/lib/expat.h"
-#include "third_party/libjingle/files/talk/xmllite/xmlparser.h"
+#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
// The base class that contains common functionality between
// AutoFillQueryXmlParser and AutoFillUploadXmlParser.
diff --git a/chrome/browser/autofill/autofill_xml_parser_unittest.cc b/chrome/browser/autofill/autofill_xml_parser_unittest.cc
index c06df83..ec5ebb5 100644
--- a/chrome/browser/autofill/autofill_xml_parser_unittest.cc
+++ b/chrome/browser/autofill/autofill_xml_parser_unittest.cc
@@ -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/files/talk/xmllite/xmlparser.h"
+#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
namespace {
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc
index 35d2820..75ea94b 100644
--- a/chrome/browser/autofill/form_structure.cc
+++ b/chrome/browser/autofill/form_structure.cc
@@ -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/files/talk/xmllite/xmlelement.h"
+#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
#include "webkit/glue/form_field.h"
using webkit_glue::FormData;
diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc
index 8965200..24ebf72 100644
--- a/chrome/browser/chromeos/login/google_authenticator.cc
+++ b/chrome/browser/chromeos/login/google_authenticator.cc
@@ -30,7 +30,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/files/talk/base/urlencode.h"
+#include "third_party/libjingle/source/talk/base/urlencode.h"
using base::Time;
using base::TimeDelta;
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc
index c70fd4c..899798ef 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/chrome/browser/sync/tools/sync_listen_notifications.cc
@@ -29,11 +29,12 @@
#include "talk/base/logging.h"
#include "talk/base/sigslot.h"
#include "talk/base/physicalsocketserver.h"
+#include "talk/base/ssladapter.h"
#include "talk/base/thread.h"
#include "talk/xmpp/jid.h"
#include "talk/xmpp/xmppclient.h"
#include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/xmppconstants.h"
+#include "talk/xmpp/constants.h"
#include "talk/xmpp/xmppengine.h"
// This is a simple utility that logs into an XMPP server, subscribes