Override SigninManager::SignOut if force-signin is enabled.

chrome/browser/ui/sync/one_click_signin_sync_starter.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/sync/one_click_signin_sync_starter.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
+#include "chrome/browser/signin/force_signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_tracker_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_observer.h"
@@ skipping 104 matching lines @@
   // Let the sync service know that setup is in progress so it doesn't start
   // syncing until the user has finished any configuration.
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   if (profile_sync_service)
     sync_blocker_ = profile_sync_service->GetSetupInProgressHandle();
 
   // Make sure the syncing is requested, otherwise the SigninManager
   // will not be able to complete successfully.
   syncer::SyncPrefs sync_prefs(profile_->GetPrefs());
   sync_prefs.SetSyncRequested(true);
+  skip_sync_confirm_ = false;
 }
 
 void OneClickSigninSyncStarter::ConfirmSignin(const std::string& oauth_token) {
   DCHECK(!oauth_token.empty());
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   // If this is a new signin (no account authenticated yet) try loading
   // policy for this user now, before any signed in services are initialized.
   if (!signin->IsAuthenticated()) {
     policy::UserPolicySigninService* policy_service =
         policy::UserPolicySigninServiceFactory::GetForProfile(profile_);
@@ skipping 149 matching lines @@
       DCHECK(!new_signin_manager->IsAuthenticated());
       DCHECK(!dm_token_.empty());
       DCHECK(!client_id_.empty());
 
       // Copy credentials from the old profile to the just-created profile,
       // and switch over to tracking that profile.
       new_signin_manager->CopyCredentialsFrom(*old_signin_manager);
       FinishProfileSyncServiceSetup();
       Initialize(new_profile, nullptr);
       DCHECK_EQ(profile_, new_profile);
+      skip_sync_confirm_ = true;
 
+      // When force signin enabled, all browser window will be closed and
+      // UserManager will be shown during signout. However, the UserManager
+      // doesn't need to be shown here because we will create a new window for
+      // the new profile soon.
+      ForceSigninManager::DisableUserManagerDisplayForNextSignOut(
+          old_signin_manager);

[Roger Tawa OOO till Jul 10th, 2016/10/26 18:25:32]

Instead of calling this here, seems like it would be better to do inside of
CopyCredentialsFrom().

       // We've transferred our credentials to the new profile - notify that
       // the signin for the original profile was cancelled (must do this after
       // we have called Initialize() with the new profile, as otherwise this
       // object will get freed when the signin on the old profile is cancelled.
       old_signin_manager->SignOut(signin_metrics::TRANSFER_CREDENTIALS,
                                   signin_metrics::SignoutDelete::IGNORE_METRIC);
 
       // Load policy for the just-created profile - once policy has finished
       // loading the signin process will complete.
       LoadPolicyWithCachedCredentials();
 
+      // Unlock the new profile.
+      ProfileAttributesEntry* entry;
+      bool has_entry =
+          g_browser_process->profile_manager()
+              ->GetProfileAttributesStorage()
+              .GetProfileAttributesWithPath(new_profile->GetPath(), &entry);
+      DCHECK(has_entry);
+      entry->SetIsSigninRequired(false);
+
       // Open the profile's first window, after all initialization.
       profiles::FindOrCreateNewWindowForProfile(
         new_profile,
         chrome::startup::IS_PROCESS_STARTUP,
         chrome::startup::IS_FIRST_RUN,
         false);
       break;
     }
     case Profile::CREATE_STATUS_REMOTE_FAIL:
     case Profile::CREATE_STATUS_CANCELED:
@@ skipping 124 matching lines @@
 void OneClickSigninSyncStarter::AccountAddedToCookie(
     const GoogleServiceAuthError& error) {
   if (first_account_added_to_cookie_)
     return;
 
   first_account_added_to_cookie_ = true;
 
   // Regardless of whether the account was successfully added or not,
   // continue with sync starting.
 
+  // TODO(zmin): Remove this hack once the https://crbug.com/657924 fixed.
+  // Skip the Sync confirmation dialog if user choose to create a new profile
+  // for the corp signin. This is because the dialog doesn't work properly
+  // after the corp signin.
+  if (skip_sync_confirm_) {
+    OnSyncConfirmationUIClosed(LoginUIService::ABORT_SIGNIN);
+    return;
+  }
+
   if (switches::UsePasswordSeparatedSigninFlow()) {
     // Under the new signin flow, the sync confirmation dialog should always be
     // shown regardless of |start_mode_|. |sync_setup_completed_callback_| will
     // be run after the modal is closed.
     DisplayModalSyncConfirmationWindow();
     return;
   }
 
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
@@ skipping 163 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }