diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
| commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
| tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /crypto | |
| parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
| download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 | |
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.
Revert "Fix build after r193020."
This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.
Revert "Really fix build after r193020."
This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec_private_key_unittest.cc | 4 | ||||
| -rw-r--r-- | crypto/ec_signature_creator_unittest.cc | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/crypto/ec_private_key_unittest.cc b/crypto/ec_private_key_unittest.cc index d2ec256..a052a9a 100644 --- a/crypto/ec_private_key_unittest.cc +++ b/crypto/ec_private_key_unittest.cc @@ -23,7 +23,7 @@ TEST(ECPrivateKeyUnitTest, OpenSSLStub) { // back the same exact public key, and the private key should have the same // value and elliptic curve params. TEST(ECPrivateKeyUnitTest, InitRandomTest) { - const std::string password1; + const std::string password1 = ""; const std::string password2 = "test"; scoped_ptr<crypto::ECPrivateKey> keypair1( @@ -86,7 +86,7 @@ TEST(ECPrivateKeyUnitTest, InitRandomTest) { } TEST(ECPrivateKeyUnitTest, BadPasswordTest) { - const std::string password1; + const std::string password1 = ""; const std::string password2 = "test"; scoped_ptr<crypto::ECPrivateKey> keypair1( diff --git a/crypto/ec_signature_creator_unittest.cc b/crypto/ec_signature_creator_unittest.cc index b34022b..df73bec 100644 --- a/crypto/ec_signature_creator_unittest.cc +++ b/crypto/ec_signature_creator_unittest.cc @@ -30,14 +30,13 @@ TEST(ECSignatureCreatorTest, BasicTest) { ASSERT_TRUE(key_original.get()); std::vector<uint8> key_info; - ASSERT_TRUE( - key_original->ExportEncryptedPrivateKey(std::string(), 1000, &key_info)); + ASSERT_TRUE(key_original->ExportEncryptedPrivateKey("", 1000, &key_info)); std::vector<uint8> pubkey_info; ASSERT_TRUE(key_original->ExportPublicKey(&pubkey_info)); scoped_ptr<crypto::ECPrivateKey> key( - crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( - std::string(), key_info, pubkey_info)); + crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo("", key_info, + pubkey_info)); ASSERT_TRUE(key.get()); ASSERT_TRUE(key->key() != NULL); |