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

Unified Diff: net/quic/crypto/crypto_utils_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/crypto_utils_test.cc
diff --git a/net/quic/crypto/crypto_utils_test.cc b/net/quic/crypto/crypto_utils_test.cc
index 882a9b50754f5d32784954e49fc7b5680cfb649d..0a12d5b52fd3b467eb92104d00ddd7a9613a0ead 100644
--- a/net/quic/crypto/crypto_utils_test.cc
+++ b/net/quic/crypto/crypto_utils_test.cc
@@ -4,6 +4,8 @@
#include "net/quic/crypto/crypto_utils.h"
+#include <string>
+
#include "net/quic/test_tools/quic_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -95,20 +97,20 @@ TEST(CryptoUtilsTest, TestExportKeyingMaterial) {
for (size_t i = 0; i < arraysize(test_vector); i++) {
// Decode the test vector.
- string subkey_secret;
- string label;
- string context;
+ std::string subkey_secret;
+ std::string label;
+ std::string context;
ASSERT_TRUE(DecodeHexString(test_vector[i].subkey_secret, &subkey_secret));
ASSERT_TRUE(DecodeHexString(test_vector[i].label, &label));
ASSERT_TRUE(DecodeHexString(test_vector[i].context, &context));
size_t result_len = test_vector[i].result_len;
bool expect_ok = test_vector[i].expected != nullptr;
- string expected;
+ std::string expected;
if (expect_ok) {
ASSERT_TRUE(DecodeHexString(test_vector[i].expected, &expected));
}
- string result;
+ std::string result;
bool ok = CryptoUtils::ExportKeyingMaterial(subkey_secret,
label,
context,

Powered by Google App Engine
This is Rietveld 408576698