Remove HttpServerProperies::GetWeakPtr().

net/quic/quic_network_transaction_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 266 matching lines @@
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   void TearDown() override {
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     // Empty the current queue.
     base::MessageLoop::current()->RunUntilIdle();
     PlatformTest::TearDown();
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     base::MessageLoop::current()->RunUntilIdle();
+    session_.reset();
   }
 
   std::unique_ptr<QuicEncryptedPacket> ConstructClientConnectionClosePacket(
       QuicPacketNumber num) {
     return client_maker_.MakeConnectionClosePacket(num);
   }
 
   std::unique_ptr<QuicEncryptedPacket> ConstructServerConnectionClosePacket(
       QuicPacketNumber num) {
     return server_maker_.MakeConnectionClosePacket(num);
@@ skipping 207 matching lines @@
     params_.quic_crypto_client_stream_factory = &crypto_client_stream_factory_;
     params_.host_resolver = &host_resolver_;
     params_.cert_verifier = &cert_verifier_;
     params_.transport_security_state = &transport_security_state_;
     params_.cert_transparency_verifier = cert_transparency_verifier_.get();
     params_.socket_performance_watcher_factory =
         &test_socket_performance_watcher_factory_;
     params_.proxy_service = proxy_service_.get();
     params_.ssl_config_service = ssl_config_service_.get();
     params_.http_auth_handler_factory = auth_handler_factory_.get();
-    params_.http_server_properties = http_server_properties_.GetWeakPtr();
+    params_.http_server_properties = &http_server_properties_;
     params_.quic_supported_versions = SupportedVersions(GetParam());
     for (const char* host :
          {kDefaultServerHostName, "www.example.org", "news.example.org",
           "bar.example.org", "foo.example.org", "invalid.example.org",
           "mail.example.com"}) {
       params_.quic_host_whitelist.insert(host);
     }
 
     session_.reset(new HttpNetworkSession(params_));
     session_->quic_stream_factory()->set_require_confirmation(false);
@@ skipping 481 matching lines @@
                                      0);
 
   socket_factory_.AddSocketDataProvider(&http_data);
   socket_factory_.AddSSLSocketDataProvider(&ssl_data_);
 
   CreateSession();
   // Send http request, ignore alternative service advertising if response
   // header advertises alternative service for mail.example.org.
   request_.url = GURL("http://mail.example.org:443");
   SendRequestAndExpectHttpResponse("hello world");
-  base::WeakPtr<HttpServerProperties> http_server_properties =
+  HttpServerProperties* http_server_properties =
       session_->http_server_properties();
   url::SchemeHostPort http_server("http", "mail.example.org", 443);
   url::SchemeHostPort https_server("https", "mail.example.org", 443);
   // Check alternative service is set for the correct origin.
   EXPECT_EQ(2u,
             http_server_properties->GetAlternativeServices(http_server).size());
   EXPECT_EQ(
       0u, http_server_properties->GetAlternativeServices(https_server).size());
 }
 
@@ skipping 11 matching lines @@
   socket_factory_.AddSocketDataProvider(&http_data);
   socket_factory_.AddSSLSocketDataProvider(&ssl_data_);
   socket_factory_.AddSocketDataProvider(&http_data);
   socket_factory_.AddSSLSocketDataProvider(&ssl_data_);
 
   CreateSession();
 
   // Send https request and set alternative services if response header
   // advertises alternative service for mail.example.org.
   SendRequestAndExpectHttpResponse("hello world");
-  base::WeakPtr<HttpServerProperties> http_server_properties =
+  HttpServerProperties* http_server_properties =
       session_->http_server_properties();
 
   const url::SchemeHostPort https_server(request_.url);
   // Check alternative service is set.
   AlternativeServiceVector alternative_service_vector =
       http_server_properties->GetAlternativeServices(https_server);
   EXPECT_EQ(2u, alternative_service_vector.size());
 
   // Send http request to the same origin but with diffrent scheme, should not
   // use QUIC.
@@ skipping 1120 matching lines @@
     params.client_socket_factory = &socket_factory_;
     params.host_resolver = &host_resolver_;
     params.cert_verifier = &cert_verifier_;
     params.transport_security_state = &transport_security_state_;
     params.cert_transparency_verifier = cert_transparency_verifier_.get();
     params.socket_performance_watcher_factory =
         &test_socket_performance_watcher_factory_;
     params.ssl_config_service = ssl_config_service_.get();
     params.proxy_service = proxy_service_.get();
     params.http_auth_handler_factory = auth_handler_factory_.get();
-    params.http_server_properties = http_server_properties_.GetWeakPtr();
+    params.http_server_properties = &http_server_properties_;
     params.quic_supported_versions = SupportedVersions(version_);
     params.quic_host_whitelist.insert("news.example.org");
     params.quic_host_whitelist.insert("mail.example.org");
     params.quic_host_whitelist.insert("mail.example.com");
 
     session_.reset(new HttpNetworkSession(params));
     session_->quic_stream_factory()->set_require_confirmation(true);
     ASSERT_EQ(params.quic_socket_receive_buffer_size,
               session_->quic_stream_factory()->socket_receive_buffer_size());
   }
 
   void TearDown() override {
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     // Empty the current queue.
     base::MessageLoop::current()->RunUntilIdle();
     PlatformTest::TearDown();
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     base::MessageLoop::current()->RunUntilIdle();
+    session_.reset();
   }
 
   void SetAlternativeService(const std::string& origin) {
     HostPortPair destination;
     switch (destination_type_) {
       case SAME_AS_FIRST:
         destination = HostPortPair(origin1_, 443);
         break;
       case SAME_AS_SECOND:
         destination = HostPortPair(origin2_, 443);
@@ skipping 339 matching lines @@
   AddHangingSocketData();
 
   SendRequestAndExpectQuicResponse(origin1_);
   SendRequestAndExpectQuicResponse(origin2_);
 
   EXPECT_TRUE(AllDataConsumed());
 }
 
 }  // namespace test
 }  // namespace net