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

Unified Diff: net/quic/crypto/aes_128_gcm_12_decrypter_test.cc

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
index 37ee8f99855f00c5d184c616d2955c95450aa29b..ddf2cbd16fd2ee95c3e27f2bc58a8250e8ad510e 100644
--- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -4,6 +4,8 @@
#include "net/quic/crypto/aes_128_gcm_12_decrypter.h"
+#include <string>
+
#include "net/quic/test_tools/quic_test_utils.h"
using base::StringPiece;
@@ -277,12 +279,12 @@ TEST(Aes128Gcm12DecrypterTest, Decrypt) {
bool has_pt = test_vectors[j].pt;
// Decode the test vector.
- string key;
- string iv;
- string ct;
- string aad;
- string tag;
- string pt;
+ std::string key;
+ std::string iv;
+ std::string ct;
+ std::string aad;
+ std::string tag;
+ std::string pt;
ASSERT_TRUE(DecodeHexString(test_vectors[j].key, &key));
ASSERT_TRUE(DecodeHexString(test_vectors[j].iv, &iv));
ASSERT_TRUE(DecodeHexString(test_vectors[j].ct, &ct));
@@ -308,7 +310,7 @@ TEST(Aes128Gcm12DecrypterTest, Decrypt) {
ASSERT_LE(static_cast<size_t>(Aes128Gcm12Decrypter::kAuthTagSize),
tag.length());
tag.resize(Aes128Gcm12Decrypter::kAuthTagSize);
- string ciphertext = ct + tag;
+ std::string ciphertext = ct + tag;
Aes128Gcm12Decrypter decrypter;
ASSERT_TRUE(decrypter.SetKey(key));

Powered by Google App Engine
This is Rietveld 408576698