Revert of Remove reference counting from HttpNetworkSession.

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
@@ skipping 211 matching lines @@
   net::NetLog net_log_;
   scoped_ptr<net::WriteToFileNetLogObserver> logger_;
   scoped_ptr<net::HostResolver> host_resolver_;
   scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_ptr<net::ChannelIDService> system_channel_id_service_;
   scoped_ptr<net::TransportSecurityState> transport_security_state_;
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
   scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory_;
   scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_;
   scoped_ptr<net::HostMappingRules> host_mapping_rules_;
-  scoped_ptr<net::HttpNetworkSession> network_session_;
+  scoped_refptr<net::HttpNetworkSession> network_session_;
   scoped_ptr<net::ProxyService> proxy_service_;
 
   FakeGCMStatsRecorder recorder_;
   scoped_ptr<GCMStore> gcm_store_;
   scoped_ptr<MCSClient> mcs_client_;
   scoped_ptr<CheckinRequest> checkin_request_;
 
   scoped_ptr<ConnectionFactoryImpl> connection_factory_;
 
   base::Thread file_thread_;
@@ skipping 43 matching lines @@
   file_thread_.Start();
   InitializeNetworkState();
   BuildNetworkSession();
   std::vector<GURL> endpoints(1,
                               GURL("https://" +
                                    net::HostPortPair(server_host_,
                                                      server_port_).ToString()));
   connection_factory_.reset(
       new ConnectionFactoryImpl(endpoints,
                                 kDefaultBackoffPolicy,
-                                network_session_.get(),
+                                network_session_,
                                 NULL,
                                 &net_log_,
                                 &recorder_));
   gcm_store_.reset(
       new GCMStoreImpl(gcm_store_path_,
                        file_thread_.task_runner(),
                        make_scoped_ptr<Encryptor>(new FakeEncryptor)));
   mcs_client_.reset(new MCSClient("probe",
                                   &clock_,
                                   connection_factory_.get(),
@@ skipping 89 matching lines @@
   session_params.http_server_properties =
       http_server_properties_->GetWeakPtr();
   session_params.network_delegate = NULL;  // TODO(zea): implement?
   session_params.host_mapping_rules = host_mapping_rules_.get();
   session_params.ignore_certificate_errors = true;
   session_params.testing_fixed_http_port = 0;
   session_params.testing_fixed_https_port = 0;
   session_params.net_log = &net_log_;
   session_params.proxy_service = proxy_service_.get();
 
-  network_session_.reset(new net::HttpNetworkSession(session_params));
+  network_session_ = new net::HttpNetworkSession(session_params);
 }
 
 void MCSProbe::ErrorCallback() {
   LOG(INFO) << "MCS error happened";
 }
 
 void MCSProbe::CheckIn() {
   LOG(INFO) << "Check-in request initiated.";
   checkin_proto::ChromeBuildProto chrome_build_proto;
   chrome_build_proto.set_platform(
@@ skipping 73 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }