Rename "xmpp/constants.*" to" xmpp/xmppconstants.*"

The intent is to fix a link error that seems to happen when two
compilation units share a filename: there is another constants.cc in
p2p/base. Touch xmppconstants.h to work around a git cl upload bug.

Review URL: http://codereview.chromium.org/244010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27283 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 21 insertions, 19 deletions

diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 4701744..80223dd 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -32,3 +32,6 @@ Local Modifications:
   * Removed Makefile.in files, *.sln, *.vcproj.
   * Removed "examples", "thirdparty", and "sessions" directories.
   * Removed a number of unneeded scope specifications to appease gcc.
+  * Renamed "talk/xmpp/constants.*" to "talk/xmpp/xmppconstants.*" to get
+    around an IncrediBuild link error.  Apparently IncrediBuild can become
+    confused when two compilation units have the same filename.
diff --git a/third_party/libjingle/files/talk/p2p/base/p2ptransport.cc b/third_party/libjingle/files/talk/p2p/base/p2ptransport.cc
index 2221d8c..4a995cf 100644
--- a/third_party/libjingle/files/talk/p2p/base/p2ptransport.cc
+++ b/third_party/libjingle/files/talk/p2p/base/p2ptransport.cc
@@ -34,7 +34,7 @@
 #include "talk/p2p/base/sessionmanager.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace {
 
diff --git a/third_party/libjingle/files/talk/p2p/base/rawtransport.cc b/third_party/libjingle/files/talk/p2p/base/rawtransport.cc
index f2e230b..0df4d5f 100644
--- a/third_party/libjingle/files/talk/p2p/base/rawtransport.cc
+++ b/third_party/libjingle/files/talk/p2p/base/rawtransport.cc
@@ -32,7 +32,7 @@
 #include "talk/p2p/base/rawtransportchannel.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace cricket {
 
diff --git a/third_party/libjingle/files/talk/p2p/base/rawtransportchannel.cc b/third_party/libjingle/files/talk/p2p/base/rawtransportchannel.cc
index 13c1886..9b56530 100644
--- a/third_party/libjingle/files/talk/p2p/base/rawtransportchannel.cc
+++ b/third_party/libjingle/files/talk/p2p/base/rawtransportchannel.cc
@@ -36,7 +36,7 @@
 #include "talk/p2p/base/stunport.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace {
 
diff --git a/third_party/libjingle/files/talk/p2p/base/session.cc b/third_party/libjingle/files/talk/p2p/base/session.cc
index 1ea0dc3..7d2a91b 100644
--- a/third_party/libjingle/files/talk/p2p/base/session.cc
+++ b/third_party/libjingle/files/talk/p2p/base/session.cc
@@ -29,7 +29,7 @@
 #include "talk/base/common.h"
 #include "talk/base/logging.h"
 #include "talk/base/helpers.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/jid.h"
 #include "talk/p2p/base/sessionclient.h"
 #include "talk/p2p/base/transport.h"
diff --git a/third_party/libjingle/files/talk/p2p/base/sessionmanager.cc b/third_party/libjingle/files/talk/p2p/base/sessionmanager.cc
index ae71a75..1b0479e 100644
--- a/third_party/libjingle/files/talk/p2p/base/sessionmanager.cc
+++ b/third_party/libjingle/files/talk/p2p/base/sessionmanager.cc
@@ -29,7 +29,7 @@
 #include "talk/base/common.h"
 #include "talk/base/helpers.h"
 #include "talk/p2p/base/constants.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/jid.h"
 
 namespace cricket {
diff --git a/third_party/libjingle/files/talk/p2p/base/transport.cc b/third_party/libjingle/files/talk/p2p/base/transport.cc
index dfa2dfd..0eac128 100644
--- a/third_party/libjingle/files/talk/p2p/base/transport.cc
+++ b/third_party/libjingle/files/talk/p2p/base/transport.cc
@@ -31,7 +31,7 @@
 #include "talk/p2p/base/transportchannelimpl.h"
 #include "talk/p2p/base/constants.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace {
 
diff --git a/third_party/libjingle/files/talk/xmpp/jid.cc b/third_party/libjingle/files/talk/xmpp/jid.cc
index ead2074..eb5b7e3 100644
--- a/third_party/libjingle/files/talk/xmpp/jid.cc
+++ b/third_party/libjingle/files/talk/xmpp/jid.cc
@@ -30,7 +30,7 @@ extern "C" {
 }
 #include <string>
 #include "talk/xmpp/jid.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/base/common.h"
 #include <algorithm>
 #include "talk/base/logging.h"
diff --git a/third_party/libjingle/files/talk/xmpp/saslcookiemechanism.h b/third_party/libjingle/files/talk/xmpp/saslcookiemechanism.h
index a126a4b..389b401 100644
--- a/third_party/libjingle/files/talk/xmpp/saslcookiemechanism.h
+++ b/third_party/libjingle/files/talk/xmpp/saslcookiemechanism.h
@@ -30,7 +30,7 @@
 
 #include "talk/xmpp/saslmechanism.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace buzz {
 
diff --git a/third_party/libjingle/files/talk/xmpp/saslmechanism.cc b/third_party/libjingle/files/talk/xmpp/saslmechanism.cc
index 45c947a..6c2b781 100644
--- a/third_party/libjingle/files/talk/xmpp/saslmechanism.cc
+++ b/third_party/libjingle/files/talk/xmpp/saslmechanism.cc
@@ -27,7 +27,7 @@
 
 #include "talk/base/base64.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/saslmechanism.h"
 
 using talk_base::Base64;
diff --git a/third_party/libjingle/files/talk/xmpp/xmppclient.cc b/third_party/libjingle/files/talk/xmpp/xmppclient.cc
index 0db9b1d4..4f31890 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppclient.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppclient.cc
@@ -27,7 +27,7 @@
 
 #include "xmppclient.h"
 #include "xmpptask.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/base/sigslot.h"
 #include "talk/xmpp/saslplainmechanism.h"
 #include "talk/xmpp/prexmppauth.h"
diff --git a/third_party/libjingle/files/talk/xmpp/constants.cc b/third_party/libjingle/files/talk/xmpp/xmppconstants.cc
index ef9dd9c..769610f 100644
--- a/third_party/libjingle/files/talk/xmpp/constants.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppconstants.cc
@@ -31,7 +31,7 @@
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmpp/jid.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 namespace buzz {
 
 const Jid JID_EMPTY(STR_EMPTY);
diff --git a/third_party/libjingle/files/talk/xmpp/constants.h b/third_party/libjingle/files/talk/xmpp/xmppconstants.h
index 95bd1a0..7610199 100644
--- a/third_party/libjingle/files/talk/xmpp/constants.h
+++ b/third_party/libjingle/files/talk/xmpp/xmppconstants.h
@@ -32,7 +32,6 @@
 #include "talk/xmllite/qname.h"
 #include "talk/xmpp/jid.h"
 
-
 #define NS_CLIENT Constants::ns_client()
 #define NS_SERVER Constants::ns_server()
 #define NS_STREAM Constants::ns_stream()
diff --git a/third_party/libjingle/files/talk/xmpp/xmppengineimpl.cc b/third_party/libjingle/files/talk/xmpp/xmppengineimpl.cc
index 64ff957..c44b6db 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppengineimpl.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppengineimpl.cc
@@ -34,7 +34,7 @@
 #include "talk/base/common.h"
 #include "talk/xmpp/xmppengineimpl.h"
 #include "talk/xmpp/xmpplogintask.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmllite/xmlprinter.h"
 #include "talk/xmpp/saslhandler.h"
 
diff --git a/third_party/libjingle/files/talk/xmpp/xmppengineimpl_iq.cc b/third_party/libjingle/files/talk/xmpp/xmppengineimpl_iq.cc
index 5834b90..86bc28e 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppengineimpl_iq.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppengineimpl_iq.cc
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include "talk/base/common.h"
 #include "talk/xmpp/xmppengineimpl.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace buzz {
 
diff --git a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
index 1890c2a..2ce3d175 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
@@ -31,7 +31,7 @@
 #include "talk/base/base64.h"
 #include "talk/base/common.h"
 #include "talk/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/saslmechanism.h"
 #include "talk/xmpp/xmppengineimpl.h"
diff --git a/third_party/libjingle/files/talk/xmpp/xmppstanzaparser.cc b/third_party/libjingle/files/talk/xmpp/xmppstanzaparser.cc
index 66ed44fb..739e6ee4 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppstanzaparser.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppstanzaparser.cc
@@ -29,7 +29,7 @@
 #include "talk/xmllite/xmlelement.h"
 #include "talk/base/common.h"
 #include "talk/xmpp/xmppstanzaparser.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 #define new TRACK_NEW
 
diff --git a/third_party/libjingle/files/talk/xmpp/xmpptask.cc b/third_party/libjingle/files/talk/xmpp/xmpptask.cc
index 4756bbe..75334ae 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpptask.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmpptask.cc
@@ -28,7 +28,7 @@
 #include "talk/xmpp/xmpptask.h"
 #include "talk/xmpp/xmppclient.h"
 #include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/ratelimitmanager.h"
 
 namespace buzz {
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index dc8f106..9b9a8e3 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -218,8 +218,6 @@
         'files/talk/xmllite/xmlparser.h',
         'files/talk/xmllite/xmlprinter.cc',
         'files/talk/xmllite/xmlprinter.h',
-        'files/talk/xmpp/constants.cc',
-        'files/talk/xmpp/constants.h',
         'files/talk/xmpp/jid.cc',
         'files/talk/xmpp/jid.h',
         'files/talk/xmpp/ratelimitmanager.cc',
@@ -228,6 +226,8 @@
         'files/talk/xmpp/saslmechanism.h',
         'files/talk/xmpp/xmppclient.cc',
         'files/talk/xmpp/xmppclient.h',
+        'files/talk/xmpp/xmppconstants.cc',
+        'files/talk/xmpp/xmppconstants.h',
         'files/talk/xmpp/xmppengineimpl.cc',
         'files/talk/xmpp/xmppengineimpl.h',
         'files/talk/xmpp/xmppengineimpl_iq.cc',