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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/disk_cache_based_quic_server_info_unittest.cc

Issue 218923002: Merge internal change: 63891842 - QuicServerId changes (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
« net/base/host_port_pair.cc ('K') | « net/http/disk_cache_based_quic_server_info.cc ('k') | net/http/http_cache.cc » ('j') | net/quic/quic_server_id_test.cc » ('J')
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..3e38a5b63a02479d5c707745968128aa565c0e11 100644
--- a/net/http/disk_cache_based_quic_server_info_unittest.cc
+++ b/net/http/disk_cache_based_quic_server_info_unittest.cc
@@ -11,7 +11,7 @@
#include "net/base/net_errors.h"
#include "net/http/mock_http_cache.h"
#include "net/quic/crypto/quic_server_info.h"
-#include "net/quic/quic_session_key.h"
+#include "net/quic/quic_server_id.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace net {
@@ -57,10 +57,9 @@ TEST(DiskCacheBasedQuicServerInfo, DeleteInCallback) {
// 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);
+ QuicServerId server_id("www.verisign.com", 443, true, kPrivacyModeDisabled);
scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
TestCompletionCallback callback;
int rv = quic_server_info->WaitForDataReady(callback.callback());
@@ -76,9 +75,9 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
AddMockTransaction(&kHostInfoTransaction1);
TestCompletionCallback callback;
- QuicSessionKey server_key("www.google.com", 443, true, kPrivacyModeDisabled);
+ QuicServerId server_id("www.google.com", 443, true, kPrivacyModeDisabled);
scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -102,7 +101,7 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
// Open the stored QuicServerInfo.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -118,7 +117,7 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
// Verify that the state was updated.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -143,9 +142,9 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
TestCompletionCallback callback;
// Persist data for port 443.
- QuicSessionKey server_key1("www.google.com", 443, true, kPrivacyModeDisabled);
+ QuicServerId server_id1("www.google.com", 443, true, kPrivacyModeDisabled);
scoped_ptr<QuicServerInfo> quic_server_info1(
- new DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id1, cache.http_cache()));
quic_server_info1->Start();
int rv = quic_server_info1->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -167,9 +166,9 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
base::MessageLoop::current()->RunUntilIdle();
// Persist data for port 80.
- QuicSessionKey server_key2("www.google.com", 80, false, kPrivacyModeDisabled);
+ QuicServerId server_id2("www.google.com", 80, false, kPrivacyModeDisabled);
scoped_ptr<QuicServerInfo> quic_server_info2(
- new DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id2, cache.http_cache()));
quic_server_info2->Start();
rv = quic_server_info2->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -192,7 +191,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
// Verify the stored QuicServerInfo for port 443.
scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key1, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id1, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -207,7 +206,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
// Verify the stored QuicServerInfo for port 80.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key2, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id2, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -230,9 +229,9 @@ TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) {
AddMockTransaction(&kHostInfoTransaction1);
TestCompletionCallback callback;
- QuicSessionKey server_key("www.google.com", 443, true, kPrivacyModeDisabled);
+ QuicServerId server_id("www.google.com", 443, true, kPrivacyModeDisabled);
scoped_ptr<QuicServerInfo> quic_server_info(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
@@ -264,7 +263,7 @@ TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) {
// Verify that the state was updated.
quic_server_info.reset(
- new DiskCacheBasedQuicServerInfo(server_key, cache.http_cache()));
+ new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
« net/base/host_port_pair.cc ('K') | « net/http/disk_cache_based_quic_server_info.cc ('k') | net/http/http_cache.cc » ('j') | net/quic/quic_server_id_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698