Merge r245242: Gracefully handle being signed out of a supervised profile.

chrome/browser/signin/profile_oauth2_token_service.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/signin/profile_oauth2_token_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
@@ skipping 128 matching lines @@
 
 void ProfileOAuth2TokenService::UpdateAuthError(
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   // Do not report connection errors as these are not actually auth errors.
   // We also want to avoid masking a "real" auth error just because we
   // subsequently get a transient network error.
   if (error.state() == GoogleServiceAuthError::CONNECTION_FAILED)
     return;
 
-  DCHECK_GT(refresh_tokens_.count(account_id), 0u);
+  if (refresh_tokens_.count(account_id) == 0) {
+    // This could happen if the preferences have been corrupted (see
+    // http://crbug.com/321370). In a Debug build that would be a bug, but in a
+    // Release build we want to deal with it gracefully.
+    NOTREACHED();
+    return;
+  }
   refresh_tokens_[account_id]->SetLastAuthError(error);
 }
 
 void ProfileOAuth2TokenService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   const std::string& account_id = GetPrimaryAccountId();
   switch (type) {
     case chrome::NOTIFICATION_TOKEN_AVAILABLE: {
@@ skipping 208 matching lines @@
     }
   }
 
   if (!old_login_token.empty() &&
       refresh_tokens_.count(GetPrimaryAccountId()) == 0) {
     UpdateCredentials(GetPrimaryAccountId(), old_login_token);
   }
 
   FireRefreshTokensLoaded();
 }