| Index: components/ownership/mock_owner_key_util.h
|
| diff --git a/chrome/browser/chromeos/settings/mock_owner_key_util.h b/components/ownership/mock_owner_key_util.h
|
| similarity index 75%
|
| rename from chrome/browser/chromeos/settings/mock_owner_key_util.h
|
| rename to components/ownership/mock_owner_key_util.h
|
| index 17f0b0ce291979a27941447393865d9580c1d787..6b0028da78617a64d381dac84c093984c11c76a8 100644
|
| --- a/chrome/browser/chromeos/settings/mock_owner_key_util.h
|
| +++ b/components/ownership/mock_owner_key_util.h
|
| @@ -2,8 +2,8 @@
|
| // 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_MOCK_OWNER_KEY_UTIL_H_
|
| -#define CHROME_BROWSER_CHROMEOS_SETTINGS_MOCK_OWNER_KEY_UTIL_H_
|
| +#ifndef COMPONENTS_OWNERSHIP_MOCK_OWNER_KEY_UTIL_H_
|
| +#define COMPONENTS_OWNERSHIP_MOCK_OWNER_KEY_UTIL_H_
|
|
|
| #include <vector>
|
|
|
| @@ -11,19 +11,22 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/chromeos/settings/owner_key_util.h"
|
| +#include "components/ownership/owner_key_util.h"
|
| +#include "components/ownership/ownership_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace ownership {
|
|
|
| -class MockOwnerKeyUtil : public OwnerKeyUtil {
|
| +class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil {
|
| public:
|
| MockOwnerKeyUtil();
|
|
|
| // OwnerKeyUtil:
|
| virtual bool ImportPublicKey(std::vector<uint8>* output) OVERRIDE;
|
| +#if defined(USE_NSS)
|
| virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
|
| const std::vector<uint8>& key,
|
| PK11SlotInfo* slot) OVERRIDE;
|
| +#endif // defined(USE_NSS)
|
| virtual bool IsPublicKeyPresent() OVERRIDE;
|
|
|
| // Clears the public and private keys.
|
| @@ -49,6 +52,6 @@ class MockOwnerKeyUtil : public OwnerKeyUtil {
|
| DISALLOW_COPY_AND_ASSIGN(MockOwnerKeyUtil);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace ownership
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_SETTINGS_MOCK_OWNER_KEY_UTIL_H_
|
| +#endif // COMPONENTS_OWNERSHIP_MOCK_OWNER_KEY_UTIL_H_
|
|
|