| Index: chromeos/cryptohome/mock_cryptohome_library.h
|
| diff --git a/chrome/browser/chromeos/cros/mock_cryptohome_library.h b/chromeos/cryptohome/mock_cryptohome_library.h
|
| similarity index 79%
|
| rename from chrome/browser/chromeos/cros/mock_cryptohome_library.h
|
| rename to chromeos/cryptohome/mock_cryptohome_library.h
|
| index f24e5087b92a62c6e16c81f4994df9e36dcf7f35..a8c6ef9064e6c6ea494fc701909dadb7db158314 100644
|
| --- a/chrome/browser/chromeos/cros/mock_cryptohome_library.h
|
| +++ b/chromeos/cryptohome/mock_cryptohome_library.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_CRYPTOHOME_LIBRARY_H_
|
| -#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_CRYPTOHOME_LIBRARY_H_
|
| +#ifndef CHROMEOS_CRYPTOHOME_MOCK_CRYPTOHOME_LIBRARY_H_
|
| +#define CHROMEOS_CRYPTOHOME_MOCK_CRYPTOHOME_LIBRARY_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| -#include "chrome/browser/chromeos/cros/cryptohome_library.h"
|
| +#include "chromeos/cryptohome/cryptohome_library.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| using ::testing::Invoke;
|
| @@ -38,10 +38,14 @@ class MockCryptohomeLibrary : public CryptohomeLibrary {
|
| MOCK_METHOD0(InstallAttributesIsReady, bool(void));
|
| MOCK_METHOD0(InstallAttributesIsInvalid, bool(void));
|
| MOCK_METHOD0(InstallAttributesIsFirstInstall, bool(void));
|
| +
|
| + MOCK_METHOD1(EncryptWithSystemSalt, std::string(const std::string&));
|
| + MOCK_METHOD1(DecryptWithSystemSalt, std::string(const std::string&));
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MockCryptohomeLibrary);
|
| };
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_CROS_MOCK_CRYPTOHOME_LIBRARY_H_
|
| +#endif // CHROMEOS_CRYPTOHOME_MOCK_CRYPTOHOME_LIBRARY_H_
|
|
|