Properly handle accounts that don't have GMail.

remoting/host/signaling_connector.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/host/signaling_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/url_request_context.h"
@@ skipping 75 matching lines @@
 }
 
 void SignalingConnector::OnOnlineStateChanged(bool online) {
   DCHECK(CalledOnValidThread());
   if (online) {
     LOG(INFO) << "Network state changed to online.";
     ResetAndTryReconnect();
   }
 }
 
-void SignalingConnector::OnRefreshTokenResponse(const std::string& access_token,
+void SignalingConnector::OnRefreshTokenResponse(const std::string& email,
+                                                const std::string& access_token,
                                                 int expires_seconds) {
   DCHECK(CalledOnValidThread());
   DCHECK(oauth_credentials_.get());
   LOG(INFO) << "Received OAuth token.";
+
+  if (email != oauth_credentials_->login) {
+    LOG(ERROR) << "User email doesn't match expected value. "
+        "The OAuth token was issued for a different account.";

[Wez, 2012/05/16 23:00:07]

Suggest "OAuth token and email address do not refer to the same account."

[Sergey Ulanov, 2012/05/17 00:38:11]

Done.

+    auth_failed_callback_.Run();
+    return;
+  }
+
   refreshing_oauth_token_ = false;
   auth_token_expiry_time_ = base::Time::Now() +
       base::TimeDelta::FromSeconds(expires_seconds) -
       base::TimeDelta::FromSeconds(kTokenUpdateTimeBeforeExpirySeconds);
   signal_strategy_->SetAuthInfo(oauth_credentials_->login,
                                 access_token, "oauth2");
 
   // Now that we've got the new token, try to connect using it.
   DCHECK_EQ(signal_strategy_->GetState(), SignalStrategy::DISCONNECTED);
   signal_strategy_->Connect();
@@ skipping 54 matching lines @@
   LOG(INFO) << "Refreshing OAuth token.";
   DCHECK(!refreshing_oauth_token_);
 
   refreshing_oauth_token_ = true;
   gaia_oauth_client_->RefreshToken(
       oauth_credentials_->client_info,
       oauth_credentials_->refresh_token, this);
 }
 
 }  // namespace remoting