Load policy before signin completes.

chrome/browser/policy/user_cloud_policy_store.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_cloud_policy_store.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
@@ skipping 170 matching lines @@
     status_ = STATUS_VALIDATION_ERROR;
     NotifyStoreError();
     return;
   }
 
   DVLOG(1) << "Validation succeeded - installing policy with dm_token: " <<
       validator->policy_data()->request_token();
   DVLOG(1) << "Device ID: " << validator->policy_data()->device_id();
 
   InstallPolicy(validator->policy_data().Pass(), validator->payload().Pass());
-  FilterDisallowedPolicies();
   status_ = STATUS_OK;
   NotifyStoreLoaded();
 }
 
 void UserCloudPolicyStore::Store(const em::PolicyFetchResponse& policy) {
   // Stop any pending requests to store policy, then validate the new policy
   // before storing it.
   weak_factory_.InvalidateWeakPtrs();
   scoped_ptr<em::PolicyFetchResponse> policy_copy(
       new em::PolicyFetchResponse(policy));
   Validate(policy_copy.Pass(),
            true,
            base::Bind(&UserCloudPolicyStore::StorePolicyAfterValidation,
                       weak_factory_.GetWeakPtr()));
 }
 
 void UserCloudPolicyStore::Validate(
     scoped_ptr<em::PolicyFetchResponse> policy,
     bool validate_in_background,
     const UserCloudPolicyValidator::CompletionCallback& callback) {
   // Configure the validator.
   scoped_ptr<UserCloudPolicyValidator> validator =
       CreateValidator(policy.Pass());
   SigninManager* signin = SigninManagerFactory::GetForProfileIfExists(profile_);
   if (signin) {
     std::string username = signin->GetAuthenticatedUsername();
-    DCHECK(!username.empty());
-    validator->ValidateUsername(username);
+    // Validate the username if the user is signed in.
+    if (!username.empty())
+      validator->ValidateUsername(username);
   }
 
   if (validate_in_background) {
     // Start validation in the background. The Validator will free itself once
     // validation is complete.
     validator.release()->StartValidation(callback);
   } else {
     // Run validation immediately and invoke the callback with the results.
     validator->RunValidation();
     callback.Run(validator.get());
@@ skipping 10 matching lines @@
     return;
   }
 
   // Persist the validated policy (just fire a task - don't bother getting a
   // reply because we can't do anything if it fails).
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&StorePolicyToDiskOnFileThread,
                  backing_file_path_, *validator->policy()));
   InstallPolicy(validator->policy_data().Pass(), validator->payload().Pass());
-  FilterDisallowedPolicies();
   status_ = STATUS_OK;
   NotifyStoreLoaded();
 }
 
-void UserCloudPolicyStore::FilterDisallowedPolicies() {
-  // We don't yet allow setting SyncDisabled in desktop cloud policy, because
-  // it causes the user to be signed out which then removes the cloud policy.
-  // TODO(atwilson): Remove this once we support signing in with sync disabled
-  // (http://crbug.com/166148).
-  policy_map_.Erase(key::kSyncDisabled);
-}
-
 }  // namespace policy