Implemented profile-aware owner key loading.

chrome/browser/chromeos/settings/session_manager_operation.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "crypto/scoped_nss_types.h"

[Mattias Nissler (ping if slow), 2014/05/15 11:21:29]

Shouldn't this also be x509_util_nss.h?

[ygorshenin1, 2014/05/15 11:58:37]

Done.

 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 class PolicyData;
 class PolicyFetchResponse;
 }
 
 namespace chromeos {
 
 class OwnerKeyUtil;
@@ skipping 35 matching lines @@
 
   // Whether the load operation is underway.
   bool is_loading() const {
     return is_loading_;
   }
 
   void set_force_key_load(bool force_key_load) {
     force_key_load_ = force_key_load;
   }
 
+  void set_username(const std::string& username) { username_ = username; }
+  void set_slot(PK11SlotInfo* slot) { slot_ = slot; }
+
  protected:
   // Runs the operation. The result is reported through |callback_|.
   virtual void Run() = 0;
 
   // Ensures the owner key is loaded.
   void EnsureOwnerKey(const base::Closure& callback);
 
   // Starts a load operation.
   void StartLoading();
 
   // Reports the result status of the operation. Once this gets called, the
   // operation should not perform further processing or trigger callbacks.
   void ReportResult(DeviceSettingsService::Status status);
 
   SessionManagerClient* session_manager_client() {
     return session_manager_client_;
   }
 
  private:
   // Loads the owner key from disk. Must be run on a thread that can do I/O.
   static scoped_refptr<OwnerKey> LoadOwnerKey(
       scoped_refptr<OwnerKeyUtil> util,
-      scoped_refptr<OwnerKey> current_key);
+      scoped_refptr<OwnerKey> current_key,
+      PK11SlotInfo* slot);
 
   // Stores the owner key loaded by LoadOwnerKey and calls |callback|.
   void StoreOwnerKey(const base::Closure& callback,
                      scoped_refptr<OwnerKey> new_key);
 
   // Triggers a device settings load.
   void RetrieveDeviceSettings();
 
   // Validates device settings after retrieval from session_manager.
   void ValidateDeviceSettings(const std::string& policy_blob);
 
   // Extracts status and device settings from the validator and reports them.
   void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);
 
   SessionManagerClient* session_manager_client_;
   scoped_refptr<OwnerKeyUtil> owner_key_util_;
 
   base::WeakPtrFactory<SessionManagerOperation> weak_factory_;
 
   Callback callback_;
 
   scoped_refptr<OwnerKey> owner_key_;
   bool force_key_load_;
+  std::string username_;
+  PK11SlotInfo* slot_;
 
   bool is_loading_;
   scoped_ptr<enterprise_management::PolicyData> policy_data_;
   scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> device_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionManagerOperation);
 };
 
 // This operation loads the public owner key from disk if appropriate, fetches
 // the policy blob from session manager, and validates the loaded policy blob.
@@ skipping 66 matching lines @@
   scoped_ptr<enterprise_management::PolicyData> new_policy_;
 
   base::WeakPtrFactory<SignAndStoreSettingsOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SignAndStoreSettingsOperation);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_