Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

chrome/browser/extensions/api/identity/account_tracker.cc

 // Copyright 2013 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/extensions/api/identity/account_tracker.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 33 matching lines @@
 
 void AccountTracker::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void AccountTracker::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void AccountTracker::OnRefreshTokenAvailable(const std::string& account_id) {
+  // Ignore refresh tokens if there is no primary account ID at all.
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  if (token_service->GetPrimaryAccountId().empty())
+    return;
+
   DVLOG(1) << "AVAILABLE " << account_id;
   ClearAuthError(account_id);
   UpdateSignInState(account_id, true);
 }
 
 void AccountTracker::OnRefreshTokenRevoked(const std::string& account_id) {
   DVLOG(1) << "REVOKED " << account_id;
   UpdateSignInState(account_id, false);
 }
 
@@ skipping 176 matching lines @@
   LOG(ERROR) << "OnOAuthError";
   tracker_->OnUserInfoFetchFailure(this);
 }
 
 void AccountIdFetcher::OnNetworkError(int response_code) {
   LOG(ERROR) << "OnNetworkError " << response_code;
   tracker_->OnUserInfoFetchFailure(this);
 }
 
 }  // namespace extensions