Remove reference counting from HttpNetworkSession.

components/gcm_driver/gcm_client_impl.cc

Index: components/gcm_driver/gcm_client_impl.cc
diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
index 1a95809f6fb1b7832cd09af1d2ea0f3326498dbb..2a079d7edaaa74aa9c493f02085e68ee2ddc0b91 100644
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -255,8 +255,8 @@ scoped_ptr<MCSClient> GCMInternalsBuilder::BuildMCSClient(
 scoped_ptr<ConnectionFactory> GCMInternalsBuilder::BuildConnectionFactory(
       const std::vector<GURL>& endpoints,
       const net::BackoffEntry::Policy& backoff_policy,
-      const scoped_refptr<net::HttpNetworkSession>& gcm_network_session,
-      const scoped_refptr<net::HttpNetworkSession>& http_network_session,
+      net::HttpNetworkSession* gcm_network_session,
+      net::HttpNetworkSession* http_network_session,
       net::NetLog* net_log,
       GCMStatsRecorder* recorder) {
   return make_scoped_ptr<ConnectionFactory>(
@@ -326,7 +326,7 @@ void GCMClientImpl::Initialize(
       url_request_context_getter_->GetURLRequestContext()->
           GetNetworkSessionParams();
   DCHECK(network_session_params);
-  network_session_ = new net::HttpNetworkSession(*network_session_params);
+  network_session_.reset(new net::HttpNetworkSession(*network_session_params));
 
   chrome_build_info_ = chrome_build_info;
 
@@ -483,11 +483,11 @@ void GCMClientImpl::InitializeMCSClient() {
   connection_factory_ = internals_builder_->BuildConnectionFactory(
       endpoints,
       GetGCMBackoffPolicy(),
-      network_session_,
+      network_session_.get(),
       url_request_context_getter_->GetURLRequestContext()
           ->http_transaction_factory()
           ->GetSession(),
-      net_log_.net_log(),
+      nullptr,

[Nicolas Zea, 2015/08/31 19:43:28]

Did you mean to change this?

[mmenke, 2015/08/31 19:48:51]

Yes.  The current code is creating a BoundNetLog with no arguments (Which has a
NULL net_log()), and then only using it to pass its NULL net_log() pointer to
this method.  Just a case of someone not familiar with net/ not doing stuff
correctly.

It's a bit removed from the CL, but I'm too lazy to make another CL that fixes
the code to be less silly.

If we want to hook up a non-NULL NetLog, we should grab the one from
HttpURLRequestContext - which even more removed from this CL, and not something
I'm all that sure we want to do.

[Nicolas Zea, 2015/08/31 22:26:49]

Got it. May as well just remove the net_log_ member variable then as it's never
actually used anymore.

[mmenke, 2015/09/01 17:20:52]

Done.

       &recorder_);
   connection_factory_->SetConnectionListener(this);
   mcs_client_ = internals_builder_->BuildMCSClient(