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

Side by Side Diff: net/spdy/spdy_session_unittest.cc

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « net/spdy/spdy_session_pool.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/spdy/spdy_session.h" 5 #include "net/spdy/spdy_session.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 1691
1692 CreateInsecureSpdySession(); 1692 CreateInsecureSpdySession();
1693 1693
1694 base::RunLoop().RunUntilIdle(); 1694 base::RunLoop().RunUntilIdle();
1695 EXPECT_TRUE(data.AllWriteDataConsumed()); 1695 EXPECT_TRUE(data.AllWriteDataConsumed());
1696 } 1696 }
1697 1697
1698 TEST_P(SpdySessionTest, ClearSettingsStorageOnIPAddressChanged) { 1698 TEST_P(SpdySessionTest, ClearSettingsStorageOnIPAddressChanged) {
1699 CreateNetworkSession(); 1699 CreateNetworkSession();
1700 1700
1701 base::WeakPtr<HttpServerProperties> test_http_server_properties = 1701 HttpServerProperties* test_http_server_properties =
1702 spdy_session_pool_->http_server_properties(); 1702 spdy_session_pool_->http_server_properties();
1703 SettingsFlagsAndValue flags_and_value1(SETTINGS_FLAG_PLEASE_PERSIST, 2); 1703 SettingsFlagsAndValue flags_and_value1(SETTINGS_FLAG_PLEASE_PERSIST, 2);
1704 test_http_server_properties->SetSpdySetting(test_server_, 1704 test_http_server_properties->SetSpdySetting(test_server_,
1705 SETTINGS_MAX_CONCURRENT_STREAMS, 1705 SETTINGS_MAX_CONCURRENT_STREAMS,
1706 SETTINGS_FLAG_PLEASE_PERSIST, 2); 1706 SETTINGS_FLAG_PLEASE_PERSIST, 2);
1707 EXPECT_NE(0u, 1707 EXPECT_NE(0u,
1708 test_http_server_properties->GetSpdySettings(test_server_).size()); 1708 test_http_server_properties->GetSpdySettings(test_server_).size());
1709 spdy_session_pool_->OnIPAddressChanged(); 1709 spdy_session_pool_->OnIPAddressChanged();
1710 EXPECT_EQ(0u, 1710 EXPECT_EQ(0u,
1711 test_http_server_properties->GetSpdySettings(test_server_).size()); 1711 test_http_server_properties->GetSpdySettings(test_server_).size());
(...skipping 4034 matching lines...) Expand 10 before | Expand all | Expand 10 after
5746 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(), 5746 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
5747 "spdy_pooling.pem"); 5747 "spdy_pooling.pem");
5748 ssl_info.is_issued_by_known_root = true; 5748 ssl_info.is_issued_by_known_root = true;
5749 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin)); 5749 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
5750 5750
5751 EXPECT_TRUE(SpdySession::CanPool( 5751 EXPECT_TRUE(SpdySession::CanPool(
5752 &tss, ssl_info, "www.example.org", "mail.example.org")); 5752 &tss, ssl_info, "www.example.org", "mail.example.org"));
5753 } 5753 }
5754 5754
5755 } // namespace net 5755 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_session_pool.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698