This broke M20 build.

remoting/jingle_glue/xmpp_signal_strategy.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 "remoting/jingle_glue/xmpp_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
@@ skipping 149 matching lines @@
 void XmppSignalStrategy::SetResourceName(const std::string &resource_name) {
   DCHECK(CalledOnValidThread());
   resource_name_ = resource_name;
 }
 
 void XmppSignalStrategy::OnConnectionStateChanged(
     buzz::XmppEngine::State state) {
   DCHECK(CalledOnValidThread());
 
   if (state == buzz::XmppEngine::STATE_OPEN) {
+    // Verify that the JID that we've received matches the username
+    // that we have. If it doesn't, then the OAuth token was probably
+    // issued for a different account, so we treat is a an auth error.
+    //
+    // TODO(sergeyu): Some user accounts may not have associated
+    // e-mail address. The check below will fail for such
+    // accounts. Make sure we can handle this case proprely.
+    if (!StartsWithASCII(GetLocalJid(), username_, false)) {
+      LOG(ERROR) << "Received JID that is different from the expected value.";
+      error_ = AUTHENTICATION_FAILED;
+      xmpp_client_->SignalStateChange.disconnect(this);
+      MessageLoop::current()->PostTask(
+          FROM_HERE, base::Bind(&DisconnectXmppClient, xmpp_client_));
+      xmpp_client_ = NULL;
+      SetState(DISCONNECTED);
+      return;
+    }
+
     keep_alive_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kKeepAliveIntervalSeconds),
         this, &XmppSignalStrategy::SendKeepAlive);
     SetState(CONNECTED);
   } else if (state == buzz::XmppEngine::STATE_CLOSED) {
     // Make sure we dump errors to the log.
     int subcode;
     buzz::XmppEngine::Error error = xmpp_client_->GetError(&subcode);
     LOG(INFO) << "XMPP connection was closed: error=" << error
               << ", subcode=" << subcode;
@@ skipping 38 matching lines @@
   std::string mechanism = notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism;
   if (settings.token_service() == "oauth2") {
     mechanism = "X-OAUTH2";
   }
 
   return new notifier::GaiaTokenPreXmppAuth(
       jid.Str(), settings.auth_cookie(), settings.token_service(), mechanism);
 }
 
 }  // namespace remoting