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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/disk_cache_based_quic_server_info_unittest.cc

Issue 211373004: Revert of Add PrivacyMode support to the QuicStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ed0e1b71577222d3f23cbdfc56212f0179ad7368..3321240055cb34cae72a47f24ad87b6d180fed02 100644
--- a/net/http/disk_cache_based_quic_server_info_unittest.cc
+++ b/net/http/disk_cache_based_quic_server_info_unittest.cc
@@ -14,7 +14,6 @@
#include "net/quic/quic_session_key.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace net {
namespace {
// This is an empty transaction, needed to register the URL and the test mode.
@@ -23,7 +22,7 @@
"",
base::Time(),
"",
- LOAD_NORMAL,
+ net::LOAD_NORMAL,
"",
"",
base::Time(),
@@ -38,7 +37,7 @@
"",
base::Time(),
"",
- LOAD_NORMAL,
+ net::LOAD_NORMAL,
"",
"",
base::Time(),
@@ -47,8 +46,6 @@
NULL,
0
};
-
-} // namespace
// Tests that we can delete a DiskCacheBasedQuicServerInfo object in a
// completion callback for DiskCacheBasedQuicServerInfo::WaitForDataReady.
@@ -57,33 +54,32 @@
// of quic_server_info->WaitForDataReady(), so that the callback will run.
MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
MockHttpCache cache(factory);
- QuicSessionKey server_key("www.verisign.com", 443, true,
- kPrivacyModeDisabled);
- scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
- quic_server_info->Start();
- TestCompletionCallback callback;
+ net::QuicSessionKey server_key("www.verisign.com", 443, true);
+ scoped_ptr<net::QuicServerInfo> quic_server_info(
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ quic_server_info->Start();
+ net::TestCompletionCallback callback;
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_EQ(net::ERR_IO_PENDING, rv);
// Now complete the backend creation and let the callback run.
factory->FinishCreation();
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
}
// Tests the basic logic of storing, retrieving and updating data.
TEST(DiskCacheBasedQuicServerInfo, Update) {
MockHttpCache cache;
AddMockTransaction(&kHostInfoTransaction1);
- TestCompletionCallback callback;
-
- QuicSessionKey server_key("www.google.com", 443, true, kPrivacyModeDisabled);
- scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ net::TestCompletionCallback callback;
+
+ net::QuicSessionKey server_key("www.google.com", 443, true);
+ scoped_ptr<net::QuicServerInfo> quic_server_info(
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
-
- QuicServerInfo::State* state = quic_server_info->mutable_state();
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+
+ net::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";
@@ -102,10 +98,10 @@
// Open the stored QuicServerInfo.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
- quic_server_info->Start();
- rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ quic_server_info->Start();
+ rv = quic_server_info->WaitForDataReady(callback.callback());
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
// And now update the data.
state = quic_server_info->mutable_state();
@@ -118,13 +114,13 @@
// Verify that the state was updated.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
- quic_server_info->Start();
- rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
- EXPECT_TRUE(quic_server_info->IsDataReady());
-
- const QuicServerInfo::State& state1 = quic_server_info->state();
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ quic_server_info->Start();
+ rv = quic_server_info->WaitForDataReady(callback.callback());
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+ EXPECT_TRUE(quic_server_info->IsDataReady());
+
+ const net::QuicServerInfo::State& state1 = quic_server_info->state();
EXPECT_EQ(server_config_a, state1.server_config);
EXPECT_EQ(source_address_token_a, state1.source_address_token);
EXPECT_EQ(server_config_sig_a, state1.server_config_sig);
@@ -140,17 +136,17 @@
MockHttpCache cache;
AddMockTransaction(&kHostInfoTransaction1);
AddMockTransaction(&kHostInfoTransaction2);
- TestCompletionCallback callback;
+ net::TestCompletionCallback callback;
// Persist data for port 443.
- QuicSessionKey server_key1("www.google.com", 443, true, kPrivacyModeDisabled);
- scoped_ptr<QuicServerInfo> quic_server_info1(
- new DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
+ net::QuicSessionKey server_key1("www.google.com", 443, true);
+ scoped_ptr<net::QuicServerInfo> quic_server_info1(
+ new net::DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
quic_server_info1->Start();
int rv = quic_server_info1->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
-
- QuicServerInfo::State* state1 = quic_server_info1->mutable_state();
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+
+ net::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";
@@ -167,14 +163,14 @@
base::MessageLoop::current()->RunUntilIdle();
// Persist data for port 80.
- QuicSessionKey server_key2("www.google.com", 80, false, kPrivacyModeDisabled);
- scoped_ptr<QuicServerInfo> quic_server_info2(
- new DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
+ net::QuicSessionKey server_key2("www.google.com", 80, false);
+ scoped_ptr<net::QuicServerInfo> quic_server_info2(
+ new net::DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
quic_server_info2->Start();
rv = quic_server_info2->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
-
- QuicServerInfo::State* state2 = quic_server_info2->mutable_state();
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+
+ net::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";
@@ -191,14 +187,14 @@
base::MessageLoop::current()->RunUntilIdle();
// Verify the stored QuicServerInfo for port 443.
- scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
- quic_server_info->Start();
- rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
- EXPECT_TRUE(quic_server_info->IsDataReady());
-
- const QuicServerInfo::State& state_a = quic_server_info->state();
+ scoped_ptr<net::QuicServerInfo> quic_server_info(
+ new net::DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
+ quic_server_info->Start();
+ rv = quic_server_info->WaitForDataReady(callback.callback());
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+ EXPECT_TRUE(quic_server_info->IsDataReady());
+
+ const net::QuicServerInfo::State& state_a = quic_server_info->state();
EXPECT_EQ(server_config_a, state_a.server_config);
EXPECT_EQ(source_address_token_a, state_a.source_address_token);
EXPECT_EQ(server_config_sig_a, state_a.server_config_sig);
@@ -207,13 +203,13 @@
// Verify the stored QuicServerInfo for port 80.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
- quic_server_info->Start();
- rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
- EXPECT_TRUE(quic_server_info->IsDataReady());
-
- const QuicServerInfo::State& state_b = quic_server_info->state();
+ new net::DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
+ quic_server_info->Start();
+ rv = quic_server_info->WaitForDataReady(callback.callback());
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+ EXPECT_TRUE(quic_server_info->IsDataReady());
+
+ const net::QuicServerInfo::State& state_b = quic_server_info->state();
EXPECT_EQ(server_config_b, state_b.server_config);
EXPECT_EQ(source_address_token_b, state_b.source_address_token);
EXPECT_EQ(server_config_sig_b, state_b.server_config_sig);
@@ -228,18 +224,18 @@
TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) {
MockHttpCache cache;
AddMockTransaction(&kHostInfoTransaction1);
- TestCompletionCallback callback;
-
- QuicSessionKey server_key("www.google.com", 443, true, kPrivacyModeDisabled);
- scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ net::TestCompletionCallback callback;
+
+ net::QuicSessionKey server_key("www.google.com", 443, true);
+ scoped_ptr<net::QuicServerInfo> quic_server_info(
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
- EXPECT_TRUE(quic_server_info->IsDataReady());
-
- QuicServerInfo::State* state = quic_server_info->mutable_state();
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+ EXPECT_TRUE(quic_server_info->IsDataReady());
+
+ net::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";
@@ -264,13 +260,13 @@
// Verify that the state was updated.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
- quic_server_info->Start();
- rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
- EXPECT_TRUE(quic_server_info->IsDataReady());
-
- const QuicServerInfo::State& state1 = quic_server_info->state();
+ new net::DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ quic_server_info->Start();
+ rv = quic_server_info->WaitForDataReady(callback.callback());
+ EXPECT_EQ(net::OK, callback.GetResult(rv));
+ EXPECT_TRUE(quic_server_info->IsDataReady());
+
+ const net::QuicServerInfo::State& state1 = quic_server_info->state();
EXPECT_EQ(server_config_a, state1.server_config);
EXPECT_EQ(source_address_token_a, state1.source_address_token);
EXPECT_EQ(server_config_sig_a, state1.server_config_sig);
@@ -280,4 +276,4 @@
RemoveMockTransaction(&kHostInfoTransaction1);
}
-} // namespace net
+} // namespace
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698