cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

chrome/browser/chromeos/policy/enterprise_install_attributes.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_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 
-namespace chromeos {
-class CryptohomeLibrary;
-}
-
 namespace policy {
 
 // Brokers access to the enterprise-related installation-time attributes on
 // ChromeOS.
 // TODO(zelidrag, mnissler): Rename + move this class - http://crbug.com/249513.
 class EnterpriseInstallAttributes {
  public:
   // Return codes for LockDevice().
   enum LockResult {
     LOCK_SUCCESS,
@@ skipping 13 matching lines @@
   static const char kUnknownDeviceMode[];
 
   // Field names in the lockbox.
   static const char kAttrEnterpriseDeviceId[];
   static const char kAttrEnterpriseDomain[];
   static const char kAttrEnterpriseMode[];
   static const char kAttrEnterpriseOwned[];
   static const char kAttrEnterpriseUser[];
   static const char kAttrConsumerKioskEnabled[];
 
-  EnterpriseInstallAttributes(
-      chromeos::CryptohomeLibrary* cryptohome,
+  explicit EnterpriseInstallAttributes(
       chromeos::CryptohomeClient* cryptohome_client);
   ~EnterpriseInstallAttributes();
 
   // Reads data from the cache file. The cache file is used to work around slow
   // cryptohome startup, which takes a while to register its DBus interface.
   // See http://crosbug.com/37367 for background on this.
   void ReadCacheFile(const base::FilePath& cache_file);
 
   // Makes sure the local caches for enterprise-related install attributes are
   // up-to-date with what cryptohome has. This method checks the readiness of
@@ skipping 58 matching lines @@
       DeviceMode device_mode,
       const std::string& device_id,
       const LockResultCallback& callback,
       chromeos::DBusMethodCallStatus call_status,
       bool result);
 
   // Confirms the registered user and invoke the callback.
   void OnReadImmutableAttributes(const std::string& user,
                                  const LockResultCallback& callback);
 
-  chromeos::CryptohomeLibrary* cryptohome_;
   chromeos::CryptohomeClient* cryptohome_client_;
 
   base::WeakPtrFactory<EnterpriseInstallAttributes> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EnterpriseInstallAttributes);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_