signin: move SigninManagerBase::Signout to SigninManager.

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 1072 matching lines @@
 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();
 }
 
 void SyncSetupHandler::HandleStopSyncing(const ListValue* args) {
   if (GetSyncService())
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
-
+#if !defined(OS_CHROMEOS)
   SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
+#endif
 }
 
 void SyncSetupHandler::HandleCloseTimeout(const ListValue* args) {
   CloseSyncSetup();
 }
 
 void SyncSetupHandler::CloseSyncSetup() {
   // TODO(atwilson): Move UMA tracking of signin events out of sync module.
   ProfileSyncService* sync_service = GetSyncService();
   if (IsActiveLogin()) {
@@ skipping 16 matching lines @@
 
     GetLoginUIService()->LoginUIClosed(this);
   }
 
   if (sync_service) {
     // Make sure user isn't left half-logged-in (signed in, but without sync
     // started up). If the user hasn't finished setting up sync, then sign out
     // and shut down sync.
     if (!sync_service->HasSyncSetupCompleted()) {
       DVLOG(1) << "Signin aborted by user action";
+#if !defined(OS_CHROMEOS)
+        // TODO(tim): Is this path even reachable on Chrome OS?

[Andrew T Wilson (Slow), 2013/05/06 09:06:00]

Possibly - the way I'd guess is:

1) User does dashboard clear
2) User clicks to re-enable sync, going through Advanced path.
3) User cancels out of Advanced dialog.

I think doing nothing here on ChromeOS is OK.

[tim (not reviewing), 2013/05/06 17:28:57]

Done.

       if (signin_tracker_.get() || sync_service->FirstSetupInProgress()) {
         // User was still in the process of signing in, so sign him out again.
         // This makes sure that the user isn't left signed in but with sync
         // un-configured.
         //
         // This has the side-effect of signing out the user in the following
         // scenario:
         //   * User signs in while sync is disabled by policy.
         //   * Sync is re-enabled by policy.
         //   * User brings up sync setup dialog to do initial sync config.
         //   * User cancels out of the dialog.
         //
         // This case is indistinguishable from the "one click signin" case where
         // the user checks the "advanced setup" checkbox, then cancels out of
         // the setup box, which is a much more common scenario, so we do the
         // right thing for the one-click case.
         SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
       }
+#endif
       sync_service->DisableForUser();
       browser_sync::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
       sync_prefs.SetStartSuppressed(true);
     }
     sync_service->SetSetupInProgress(false);
   }
 
   // Reset the attempted email address and error, otherwise the sync setup
   // overlay in the settings page will stay in whatever error state it was last
   // when it is reopened.
@@ skipping 144 matching lines @@
     // closing this tab in mid-handler can cause crashes. Instead, close it
     // via a task so we know we aren't in the middle of any webui code.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&CloseTab, base::Unretained(active_gaia_signin_tab_)));
 
     active_gaia_signin_tab_ = NULL;
   }
 }
 
+#if !defined(OS_CHROMEOS)
+// Used by HandleSubmitAuth.
 bool SyncSetupHandler::IsLoginAuthDataValid(const std::string& username,
                                             string16* error_message) {
   if (username.empty())
     return true;
 
   // Can be null during some unit tests.
   if (!web_ui())
     return true;
 
   if (!SigninManagerFactory::GetForProfile(
@@ skipping 16 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }
+
+#endif  // !defined(OS_CHROMEOS)