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

Unified Diff: net/quic/quic_crypto_server_stream_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/quic_crypto_server_stream_test.cc
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index f3ea48a475e8bf4abcf06716fd7a2a6072bddb46..d22a51f7a49594bb1a9e8a2c7b2a9d5966258489 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -5,6 +5,7 @@
#include "net/quic/quic_crypto_server_stream.h"
#include <map>
+#include <string>
#include <vector>
#include "base/memory/scoped_ptr.h"
@@ -39,11 +40,12 @@ namespace test {
class QuicCryptoServerConfigPeer {
public:
- static string GetPrimaryOrbit(const QuicCryptoServerConfig& config) {
+ static std::string GetPrimaryOrbit(const QuicCryptoServerConfig& config) {
base::AutoLock lock(config.configs_lock_);
CHECK(config.primary_config_.get() != nullptr);
- return string(reinterpret_cast<const char*>(config.primary_config_->orbit),
- kOrbitSize);
+ return std::string(
+ reinterpret_cast<const char*>(config.primary_config_->orbit),
+ kOrbitSize);
}
};
@@ -75,7 +77,7 @@ class QuicCryptoServerStreamTest : public ::testing::TestWithParam<bool> {
session_.config(), &crypto_config_);
if (AsyncStrikeRegisterVerification()) {
- string orbit =
+ std::string orbit =
QuicCryptoServerConfigPeer::GetPrimaryOrbit(crypto_config_);
strike_register_client_ = new DelayedVerifyStrikeRegisterClient(
10000, // strike_register_max_entries

Powered by Google App Engine
This is Rietveld 408576698