policy: Remove SigninManager from UserCloudPolicyStore.

chrome/browser/policy/cloud/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/cloud/user_cloud_policy_store.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/task_runner_util.h"
@@ skipping 81 matching lines @@
 }
 
 }  // namespace
 
 UserCloudPolicyStore::UserCloudPolicyStore(
     Profile* profile,
     const base::FilePath& path,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner)
     : UserCloudPolicyStoreBase(background_task_runner),
       weak_factory_(this),
       profile_(profile),

[Joao da Silva, 2013/11/04 09:58:32]

This can now be removed, please do it.

[pneubeck (no reviews), 2013/11/04 10:59:46]

Done.

       backing_file_path_(path) {}
 
 UserCloudPolicyStore::~UserCloudPolicyStore() {}
 
 // static
 scoped_ptr<UserCloudPolicyStore> UserCloudPolicyStore::Create(
     Profile* profile,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner) {
   base::FilePath path =
       profile->GetPath().Append(kPolicyDir).Append(kPolicyCacheFile);
   return make_scoped_ptr(
       new UserCloudPolicyStore(profile, path, background_task_runner));
 }
 
+void UserCloudPolicyStore::SetSigninUsername(const std::string& username) {
+  signin_username_ = username;
+}
+
 void UserCloudPolicyStore::LoadImmediately() {
   DVLOG(1) << "Initiating immediate policy load from disk";
   // Cancel any pending Load/Store/Validate operations.
   weak_factory_.InvalidateWeakPtrs();
   // Load the policy from disk...
   PolicyLoadResult result = LoadPolicyFromDisk(backing_file_path_);
   // ...and install it, reporting success/failure to any observers.
   PolicyLoaded(false, result);
 }
 
@@ skipping 83 matching lines @@
 }
 
 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(),
       CloudPolicyValidatorBase::TIMESTAMP_NOT_BEFORE);
-  SigninManager* signin = SigninManagerFactory::GetForProfileIfExists(profile_);
-  if (signin) {
-    std::string username = signin->GetAuthenticatedUsername();
-    if (username.empty())
-      username = signin->GetUsernameForAuthInProgress();
 
-    // Validate the username if the user is signed in (or in the process of
-    // signing in).
-    if (!username.empty())
-      validator->ValidateUsername(username);
-  }
+  // Validate the username if the user is signed in.
+  if (!signin_username_.empty())
+    validator->ValidateUsername(signin_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 14 matching lines @@
   background_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&StorePolicyToDiskOnBackgroundThread,
                  backing_file_path_, *validator->policy()));
   InstallPolicy(validator->policy_data().Pass(), validator->payload().Pass());
   status_ = STATUS_OK;
   NotifyStoreLoaded();
 }
 
 }  // namespace policy