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

Unified Diff: base/crypto/symmetric_key_unittest.cc

Issue 1528021: Implement PBKDF2-based key derivation, random key generation,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Make albertb's suggested changes. Created 10 years, 8 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
« no previous file with comments | « base/crypto/symmetric_key_nss.cc ('k') | base/crypto/symmetric_key_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/crypto/symmetric_key_unittest.cc
===================================================================
--- base/crypto/symmetric_key_unittest.cc (revision 43766)
+++ base/crypto/symmetric_key_unittest.cc (working copy)
@@ -10,13 +10,7 @@
#include "base/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(USE_NSS) || defined(OS_MACOSX)
-#define MAYBE(name) name
-#else
-#define MAYBE(name) DISABLED_ ## name
-#endif
-
-TEST(SymmetricKeyTest, MAYBE(GenerateRandomKey)) {
+TEST(SymmetricKeyTest, GenerateRandomKey) {
scoped_ptr<base::SymmetricKey> key(
base::SymmetricKey::GenerateRandomKey(base::SymmetricKey::AES, 256));
EXPECT_TRUE(NULL != key.get());
@@ -165,7 +159,7 @@
}
};
-TEST(SymmetricKeyTest, MAYBE(DeriveKeyFromPassword)) {
+TEST(SymmetricKeyTest, DeriveKeyFromPassword) {
for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(test_vectors); ++i) {
SCOPED_TRACE(StringPrintf("Test[%u]", i));
#if defined(OS_MACOSX)
« no previous file with comments | « base/crypto/symmetric_key_nss.cc ('k') | base/crypto/symmetric_key_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698