Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

chrome/browser/policy/cloud/user_policy_signin_service.cc

Index: chrome/browser/policy/cloud/user_policy_signin_service.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc
index db1349a20a46a9a19bff7bec477954537f7dcb22..19e7006f47a510cd2a7de4a398353d55819aac7e 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc
@@ -112,8 +112,11 @@ void UserPolicySigninService::OnRefreshTokenAvailable(
   }
 
   std::string username = GetSigninManager()->GetAuthenticatedUsername();
-  // Should not have OAuth tokens if the user isn't signed in.
-  DCHECK(!username.empty());
+
+  // Ignore OAuth tokens for any account but the primary one.
+  if (username != account_id)

[Andrew T Wilson (Slow), 2013/11/05 14:52:23]

I think this should be:

if (account_id != oauth2_token_service_->GetPrimaryAccountId())
  return

...rather than assuming that account IDs are email addresses (Roger has been
threatening to break that assumption).

[Bernhard Bauer, 2013/11/05 16:26:51]

Done.

+    return;
+
   // ProfileOAuth2TokenService now has a refresh token so initialize the
   // UserCloudPolicyManager.
   InitializeForSignedInUser(username);