[sync] Force gaia re-auth on CrOs during sign in after changing password

chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/user.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/signin/signin_manager_base.h"
 #else
 #include "chrome/browser/signin/signin_manager.h"
 #endif
 
 using content::WebContents;
 using l10n_util::GetStringFUTF16;
 using l10n_util::GetStringUTF16;
 
 namespace {
@@ skipping 799 matching lines @@
     // signin) or by directly navigating to settings/syncSetup
     // (http://crbug.com/229836). So just exit.
     DLOG(WARNING) << "Cannot display sync setup UI when not signed in";
     CloseOverlay();
     return;
   }
   OpenSyncSetup();
 }
 
 #if defined(OS_CHROMEOS)
-// On ChromeOS, we need to sign out the user session to fix an auth error, so
-// the user goes through the real signin flow to generate a new auth token.
+// On ChromeOS, we invalidate the existing OAuth2 token and sign out the user
+// session to fix an auth error, so the user goes through the real signin flow
+// to generate a new auth token.
 void SyncSetupHandler::HandleDoSignOutOnAuthError(const ListValue* args) {
   DLOG(INFO) << "Signing out the user to fix a sync error.";
+  chromeos::UserManager::Get()->SaveUserOAuthStatus(
+      chromeos::UserManager::Get()->GetLoggedInUser()->email(),
+      chromeos::User::OAUTH2_TOKEN_STATUS_INVALID);
   chrome::AttemptUserExit();
 }
 #endif
 
 #if !defined(OS_CHROMEOS)
 void SyncSetupHandler::HandleStartSignin(const ListValue* args) {
   // Should only be called if the user is not already signed in.
   DCHECK(SigninManagerFactory::GetForProfile(GetProfile())->
       GetAuthenticatedUsername().empty());
   OpenSyncSetup();
@@ skipping 210 matching lines @@
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }
 
 void SyncSetupHandler::CloseOverlay() {
   // Stop a timer to handle timeout in waiting for sync setup.
   backend_start_timer_.reset();
 
   CloseSyncSetup();
   web_ui()->CallJavascriptFunction("OptionsPage.closeOverlay");
 }