Index: net/http/disk_cache_based_quic_server_info_unittest.cc |
diff --git a/net/http/disk_cache_based_quic_server_info_unittest.cc b/net/http/disk_cache_based_quic_server_info_unittest.cc |
index 847b3d8a16e51132a4426c386953039dada124dd..a418bdc2acb2b8750da667f9457de9c79ec81c42 100644 |
--- a/net/http/disk_cache_based_quic_server_info_unittest.cc |
+++ b/net/http/disk_cache_based_quic_server_info_unittest.cc |
@@ -4,6 +4,8 @@ |
#include "net/http/disk_cache_based_quic_server_info.h" |
+#include <string> |
+ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/compiler_specific.h" |
@@ -84,11 +86,11 @@ TEST(DiskCacheBasedQuicServerInfo, Update) { |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
- const string cert_b = "cert_b"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
+ const std::string cert_b = "cert_b"; |
state->server_config = server_config_a; |
state->source_address_token = source_address_token_a; |
@@ -151,10 +153,10 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) { |
QuicServerInfo::State* state1 = quic_server_info1->mutable_state(); |
EXPECT_TRUE(state1->certs.empty()); |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
state1->server_config = server_config_a; |
state1->source_address_token = source_address_token_a; |
@@ -175,10 +177,10 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) { |
QuicServerInfo::State* state2 = quic_server_info2->mutable_state(); |
EXPECT_TRUE(state2->certs.empty()); |
- const string server_config_b = "server_config_b"; |
- const string source_address_token_b = "source_address_token_b"; |
- const string server_config_sig_b = "server_config_sig_b"; |
- const string cert_b = "cert_b"; |
+ const std::string server_config_b = "server_config_b"; |
+ const std::string source_address_token_b = "source_address_token_b"; |
+ const std::string server_config_sig_b = "server_config_sig_b"; |
+ const std::string cert_b = "cert_b"; |
state2->server_config = server_config_b; |
state2->source_address_token = source_address_token_b; |
@@ -240,10 +242,10 @@ TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) { |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
state->server_config = server_config_a; |
state->source_address_token = source_address_token_a; |
@@ -297,10 +299,10 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersist) { |
// Persist data once. |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_init = "server_config_init"; |
- const string source_address_token_init = "source_address_token_init"; |
- const string server_config_sig_init = "server_config_sig_init"; |
- const string cert_init = "cert_init"; |
+ const std::string server_config_init = "server_config_init"; |
+ const std::string source_address_token_init = "source_address_token_init"; |
+ const std::string server_config_sig_init = "server_config_sig_init"; |
+ const std::string cert_init = "cert_init"; |
state->server_config = server_config_init; |
state->source_address_token = source_address_token_init; |
@@ -320,10 +322,10 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersist) { |
// Persist one more time using the same |quic_server_info| object and without |
// doing another Start() and WaitForDataReady. |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
state->server_config = server_config_a; |
state->source_address_token = source_address_token_a; |
@@ -412,10 +414,10 @@ TEST(DiskCacheBasedQuicServerInfo, StartAndPersist) { |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
state->server_config = server_config_a; |
state->source_address_token = source_address_token_a; |
@@ -473,10 +475,10 @@ TEST(DiskCacheBasedQuicServerInfo, PersistWhenNotReadyToPersist) { |
// Persist data once, even though the backend is not ready. |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_init = "server_config_init"; |
- const string source_address_token_init = "source_address_token_init"; |
- const string server_config_sig_init = "server_config_sig_init"; |
- const string cert_init = "cert_init"; |
+ const std::string server_config_init = "server_config_init"; |
+ const std::string source_address_token_init = "source_address_token_init"; |
+ const std::string server_config_sig_init = "server_config_sig_init"; |
+ const std::string cert_init = "cert_init"; |
state->server_config = server_config_init; |
state->source_address_token = source_address_token_init; |
@@ -528,10 +530,10 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersistsWithoutWaiting) { |
// Persist data once. |
QuicServerInfo::State* state = quic_server_info->mutable_state(); |
EXPECT_TRUE(state->certs.empty()); |
- const string server_config_init = "server_config_init"; |
- const string source_address_token_init = "source_address_token_init"; |
- const string server_config_sig_init = "server_config_sig_init"; |
- const string cert_init = "cert_init"; |
+ const std::string server_config_init = "server_config_init"; |
+ const std::string source_address_token_init = "source_address_token_init"; |
+ const std::string server_config_sig_init = "server_config_sig_init"; |
+ const std::string cert_init = "cert_init"; |
state->server_config = server_config_init; |
state->source_address_token = source_address_token_init; |
@@ -546,10 +548,10 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersistsWithoutWaiting) { |
// Persist one more time using the same |quic_server_info| object and without |
// doing another Start() and WaitForDataReady. |
- const string server_config_a = "server_config_a"; |
- const string source_address_token_a = "source_address_token_a"; |
- const string server_config_sig_a = "server_config_sig_a"; |
- const string cert_a = "cert_a"; |
+ const std::string server_config_a = "server_config_a"; |
+ const std::string source_address_token_a = "source_address_token_a"; |
+ const std::string server_config_sig_a = "server_config_sig_a"; |
+ const std::string cert_a = "cert_a"; |
state->server_config = server_config_a; |
state->source_address_token = source_address_token_a; |