Merge 182705

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 178 matching lines @@
   icu::UnicodeString icu_input(username16.data(), username16.length());
   matcher.reset(icu_input);
   status = U_ZERO_ERROR;
   UBool match = matcher.matches(status);
   DCHECK(U_SUCCESS(status));
   return !!match;  // !! == convert from UBool to bool.
 }
 
 SigninManager::SigninManager()
     : profile_(NULL),
+      prohibit_signout_(false),
       had_two_factor_error_(false),
       type_(SIGNIN_TYPE_NONE),
       weak_pointer_factory_(this) {
 }
 
 SigninManager::~SigninManager() {
   DCHECK(!signin_global_error_.get()) <<
       "SigninManager::Initialize called but not SigninManager::Shutdown";
 }
 
@@ skipping 328 matching lines @@
 
   // In some cases, the user should not be signed out.  For example, the failure
   // may be due to a captcha or OTP challenge.  In these cases, the transient
   // data must be kept to properly handle the follow up.
   if (clear_transient_data)
     ClearTransientSigninData();
 }
 
 void SigninManager::SignOut() {
   DCHECK(IsInitialized());
+  if (prohibit_signout_) {
+    DVLOG(1) << "Ignoring attempt to sign out while signout is prohibited";
+    return;
+  }
   if (authenticated_username_.empty() && !client_login_.get()) {
     // Clean up our transient data and exit if we aren't signed in (or in the
     // process of signing in). This avoids a perf regression from clearing out
     // the TokenDB if SignOut() is invoked on startup to clean up any
     // incomplete previous signin attempts.
     ClearTransientSigninData();
     return;
   }
 
   GoogleServiceSignoutDetails details(authenticated_username_);
@@ skipping 330 matching lines @@
 }
 
 void SigninManager::Shutdown() {
   if (signin_global_error_.get()) {
     GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(
         signin_global_error_.get());
     signin_global_error_.reset();
   }
 }
 
+void SigninManager::ProhibitSignout() {
+  prohibit_signout_ = true;
+}
+
+bool SigninManager::IsSignoutProhibited() const {
+  return prohibit_signout_;
+}
+
 void SigninManager::OnGoogleServicesUsernamePatternChanged() {
   if (!authenticated_username_.empty() &&
       !IsAllowedUsername(authenticated_username_)) {
     // Signed in user is invalid according to the current policy so sign
     // the user out.
     SignOut();
   }
 }
 
 void SigninManager::AddSigninDiagnosticsObserver(
@@ skipping 14 matching lines @@
                     NotifySigninValueChanged(field, value));
 }
 
 void SigninManager::NotifyDiagnosticsObservers(
     const TimedSigninStatusField& field,
     const std::string& value) {
   FOR_EACH_OBSERVER(SigninDiagnosticsObserver,
                     signin_diagnostics_observers_,
                     NotifySigninValueChanged(field, value));
 }