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

Unified Diff: base/crypto/encryptor_unittest.cc

Issue 1558018: Implements support for PBKDF2-based key derivation, random key generation, an... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Style fixup Created 10 years, 9 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/encryptor.h ('k') | base/crypto/encryptor_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/crypto/encryptor_unittest.cc
===================================================================
--- base/crypto/encryptor_unittest.cc (revision 43354)
+++ base/crypto/encryptor_unittest.cc (working copy)
@@ -11,13 +11,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(EncryptorTest, MAYBE(EncryptDecrypt)) {
+TEST(EncryptorTest, EncryptDecrypt) {
scoped_ptr<base::SymmetricKey> key(base::SymmetricKey::DeriveKeyFromPassword(
base::SymmetricKey::AES, "password", "saltiest", 1000, 256));
EXPECT_TRUE(NULL != key.get());
« no previous file with comments | « base/crypto/encryptor.h ('k') | base/crypto/encryptor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698