Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: components/ownership/mock_owner_key_util.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GYP files are fixed. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/ownership/mock_owner_key_util.cc
diff --git a/chrome/browser/chromeos/settings/mock_owner_key_util.cc b/components/ownership/mock_owner_key_util.cc
similarity index 78%
rename from chrome/browser/chromeos/settings/mock_owner_key_util.cc
rename to components/ownership/mock_owner_key_util.cc
index 2cb4a74bfb5f970c164526557b1a29fcb96c39f1..2a7ec8af0259a107800845be2c3410ac778899dd 100644
--- a/chrome/browser/chromeos/settings/mock_owner_key_util.cc
+++ b/components/ownership/mock_owner_key_util.cc
@@ -2,26 +2,31 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
+#include "components/ownership/mock_owner_key_util.h"
+#include "base/files/file_path.h"
#include "crypto/rsa_private_key.h"
-namespace chromeos {
+namespace ownership {
-MockOwnerKeyUtil::MockOwnerKeyUtil() {}
+MockOwnerKeyUtil::MockOwnerKeyUtil() : OwnerKeyUtil(base::FilePath()) {
+}
-MockOwnerKeyUtil::~MockOwnerKeyUtil() {}
+MockOwnerKeyUtil::~MockOwnerKeyUtil() {
+}
bool MockOwnerKeyUtil::ImportPublicKey(std::vector<uint8>* output) {
*output = public_key_;
return !public_key_.empty();
}
+#if defined(USE_NSS)
crypto::RSAPrivateKey* MockOwnerKeyUtil::FindPrivateKeyInSlot(
const std::vector<uint8>& key,
PK11SlotInfo* slot) {
return private_key_.get() ? private_key_->Copy() : NULL;
}
+#endif // defined(USE_NSS)
bool MockOwnerKeyUtil::IsPublicKeyPresent() {
return !public_key_.empty();
@@ -46,4 +51,4 @@ void MockOwnerKeyUtil::SetPrivateKey(scoped_ptr<crypto::RSAPrivateKey> key) {
private_key_->ExportPublicKey(&public_key_);
}
-} // namespace chromeos
+} // namespace ownership

Powered by Google App Engine
This is Rietveld 408576698