Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

chrome/browser/policy/cloud/user_policy_signin_service.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 "chrome/browser/policy/cloud/user_policy_signin_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 94 matching lines @@
 void UserPolicySigninService::OnRefreshTokenAvailable(
     const std::string& account_id) {
   // If using a TestingProfile with no UserCloudPolicyManager, skip
   // initialization.
   if (!GetManager()) {
     DVLOG(1) << "Skipping initialization for tests due to missing components.";
     return;
   }
 
   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);
 }
 
 void UserPolicySigninService::InitializeUserCloudPolicyManager(
     scoped_ptr<CloudPolicyClient> client) {
   UserPolicySigninServiceBase::InitializeUserCloudPolicyManager(client.Pass());
   ProhibitSignoutIfNeeded();
 }
@@ skipping 57 matching lines @@
 }
 
 void UserPolicySigninService::ProhibitSignoutIfNeeded() {
   if (GetManager()->IsClientRegistered()) {
     DVLOG(1) << "User is registered for policy - prohibiting signout";
     GetSigninManager()->ProhibitSignout(true);
   }
 }
 
 }  // namespace policy