Changed allow-non-google-login to allow-generated-jid.

BUG=none
TEST=tested manually with non-gmail google account

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

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

4 files changed, 5 insertions, 8 deletions

diff --git a/third_party/libjingle/files/talk/xmpp/xmppconstants.cc b/third_party/libjingle/files/talk/xmpp/xmppconstants.cc
index 769610f..80e78ee 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppconstants.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppconstants.cc
@@ -209,7 +209,7 @@ const QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT(true, NS_GOOGLE_AUTH_PRO
 
 const std::string NS_GOOGLE_AUTH("google:auth");
 const QName QN_MISSING_USERNAME(true, NS_GOOGLE_AUTH, "missing-username");
-const QName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN(true, NS_GOOGLE_AUTH_PROTOCOL, "allow-non-google-login");
+const QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN(true, NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid");
 
 const QName QN_DIALBACK_RESULT(true, NS_DIALBACK, "result");
 const QName QN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify");
diff --git a/third_party/libjingle/files/talk/xmpp/xmppconstants.h b/third_party/libjingle/files/talk/xmpp/xmppconstants.h
index 7610199..a53217b 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppconstants.h
+++ b/third_party/libjingle/files/talk/xmpp/xmppconstants.h
@@ -174,7 +174,7 @@ extern const std::string NS_GOOGLE_AUTH;
 extern const QName QN_MISSING_USERNAME;
 extern const std::string NS_GOOGLE_AUTH_PROTOCOL;
 extern const QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT;
-extern const QName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN;
+extern const QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN;
 
 extern const QName QN_DIALBACK_RESULT;
 extern const QName QN_DIALBACK_VERIFY;
diff --git a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
index 04c8dd1..2b6ddce 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
@@ -216,7 +216,7 @@ XmppLoginTask::Advance() {
           return Failure(XmppEngine::ERROR_AUTH);
         }
 
-        auth->SetAttr(QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN, "true");
+        auth->SetAttr(QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN, "true");
         auth->SetAttr(QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT, "true");
 
         pctx_->InternalSendStanza(auth);
diff --git a/third_party/libjingle/mods-since-v0_4_0.diff b/third_party/libjingle/mods-since-v0_4_0.diff
index a3a6be6..94eb14d 100644
--- a/third_party/libjingle/mods-since-v0_4_0.diff
+++ b/third_party/libjingle/mods-since-v0_4_0.diff
@@ -1155,10 +1155,7 @@ Only in libjingle/files/talk/base: winsock_initializer.h
 Only in libjingle-0.4.0/talk: examples
 Only in libjingle-0.4.0/talk: libjingle.sln
 Only in libjingle-0.4.0/talk: libjingle.vcproj
-Only in libjingle-0.4.0/talk/p2p: Makefile.am
-Only in libjingle-0.4.0/talk/p2p: Makefile.in
-Only in libjingle-0.4.0/talk/p2p: base
-Only in libjingle-0.4.0/talk/p2p: client
+Only in libjingle-0.4.0/talk: p2p
 Only in libjingle-0.4.0/talk: session
 Only in libjingle-0.4.0/talk: third_party
 Only in libjingle-0.4.0/talk/xmllite: Makefile.in
@@ -1442,7 +1439,7 @@ diff -r libjingle-0.4.0/talk/xmpp/xmpplogintask.cc libjingle/files/talk/xmpp/xmp
 ---
 > #endif  // !defined(NDEBUG)
 218a219,221
->         auth->SetAttr(QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN, "true");
+>         auth->SetAttr(QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN, "true");
 >         auth->SetAttr(QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT, "true");
 > 
 diff -r libjingle-0.4.0/talk/xmpp/xmpplogintask.h libjingle/files/talk/xmpp/xmpplogintask.h