Merge 182705

chrome/browser/policy/user_policy_signin_service.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/policy/user_policy_signin_service.h"
 
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
@@ skipping 390 matching lines @@
 
 void UserPolicySigninService::InitializeUserCloudPolicyManager(
     scoped_ptr<CloudPolicyClient> client) {
   UserCloudPolicyManager* manager = GetManager();
   DCHECK(!manager->core()->client());
   // If there is no cached DMToken then we can detect this below (or when
   // the OnInitializationCompleted() callback is invoked).
   manager->Connect(g_browser_process->local_state(), client.Pass());
   DCHECK(manager->core()->service());
   StartObserving();
+  ProhibitSignoutIfNeeded();
 }
 
 void UserPolicySigninService::InitializeForSignedInUser() {
   SigninManager* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
   std::string username = signin_manager->GetAuthenticatedUsername();
 
   if (!ShouldLoadPolicyForUser(username)) {
     VLOG(1) << "Policy load not enabled for user: " << username;
     return;
@@ skipping 46 matching lines @@
     std::string token = TokenServiceFactory::GetForProfile(profile_)->
         GetOAuth2LoginRefreshToken();
     if (token.empty()) {
       // No token yet - this class listens for NOTIFICATION_TOKEN_AVAILABLE
       // and will re-attempt registration once the token is available.
       DLOG(WARNING) << "No OAuth Refresh Token - delaying policy download";
       return;
     }
     RegisterCloudPolicyService(token);
   }
+  // If client is registered now, prohibit signout.
+  ProhibitSignoutIfNeeded();
 }
 
 void UserPolicySigninService::RegisterCloudPolicyService(
     std::string login_token) {
   DCHECK(!GetManager()->IsClientRegistered());
   DVLOG(1) << "Fetching new DM Token";
   // Do nothing if already starting the registration process.
   if (registration_helper_)
     return;
 
   // Start the process of registering the CloudPolicyClient. Once it completes,
   // policy fetch will automatically happen.
   registration_helper_.reset(
       new CloudPolicyClientRegistrationHelper(profile_->GetRequestContext()));
   registration_helper_->StartRegistration(
       GetManager()->core()->client(),
       login_token,
       base::Bind(&UserPolicySigninService::OnRegistrationComplete,
                  base::Unretained(this)));
 }
 
 void UserPolicySigninService::OnRegistrationComplete() {
+  ProhibitSignoutIfNeeded();
   registration_helper_.reset();
 }
 
+void UserPolicySigninService::ProhibitSignoutIfNeeded() {
+  if (GetManager()->IsClientRegistered()) {
+    DVLOG(1) << "User is registered for policy - prohibiting signout";
+    SigninManager* signin_manager =
+        SigninManagerFactory::GetForProfile(profile_);
+    signin_manager->ProhibitSignout();
+  }
+}
+
 void UserPolicySigninService::Shutdown() {
   // Stop any pending registration helper activity. We do this here instead of
   // in the destructor because we want to shutdown the registration helper
   // before UserCloudPolicyManager shuts down the CloudPolicyClient.
   registration_helper_.reset();
   StopObserving();
 }
 
 UserCloudPolicyManager* UserPolicySigninService::GetManager() {
   return UserCloudPolicyManagerFactory::GetForProfile(profile_);
 }
 
 }  // namespace policy