OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "google_apis/gcm/engine/connection_factory_impl.h" | 5 #include "google_apis/gcm/engine/connection_factory_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 net::HttpNetworkSession* http_network_session, | 55 net::HttpNetworkSession* http_network_session, |
56 net::NetLog* net_log, | 56 net::NetLog* net_log, |
57 GCMStatsRecorder* recorder) | 57 GCMStatsRecorder* recorder) |
58 : mcs_endpoints_(mcs_endpoints), | 58 : mcs_endpoints_(mcs_endpoints), |
59 next_endpoint_(0), | 59 next_endpoint_(0), |
60 last_successful_endpoint_(0), | 60 last_successful_endpoint_(0), |
61 backoff_policy_(backoff_policy), | 61 backoff_policy_(backoff_policy), |
62 gcm_network_session_(gcm_network_session), | 62 gcm_network_session_(gcm_network_session), |
63 http_network_session_(http_network_session), | 63 http_network_session_(http_network_session), |
64 bound_net_log_( | 64 bound_net_log_( |
65 net::BoundNetLog::Make(net_log, net::NetLogSourceType::SOCKET)), | 65 net::NetLogWithSource::Make(net_log, net::NetLogSourceType::SOCKET)), |
66 pac_request_(NULL), | 66 pac_request_(NULL), |
67 connecting_(false), | 67 connecting_(false), |
68 waiting_for_backoff_(false), | 68 waiting_for_backoff_(false), |
69 waiting_for_network_online_(false), | 69 waiting_for_network_online_(false), |
70 logging_in_(false), | 70 logging_in_(false), |
71 recorder_(recorder), | 71 recorder_(recorder), |
72 listener_(NULL), | 72 listener_(NULL), |
73 weak_ptr_factory_(this) { | 73 weak_ptr_factory_(this) { |
74 DCHECK_GE(mcs_endpoints_.size(), 1U); | 74 DCHECK_GE(mcs_endpoints_.size(), 1U); |
75 DCHECK(!http_network_session_ || | 75 DCHECK(!http_network_session_ || |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 | 574 |
575 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() { | 575 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() { |
576 if (!http_network_session_ || !http_network_session_->http_auth_cache()) | 576 if (!http_network_session_ || !http_network_session_->http_auth_cache()) |
577 return; | 577 return; |
578 | 578 |
579 gcm_network_session_->http_auth_cache()->UpdateAllFrom( | 579 gcm_network_session_->http_auth_cache()->UpdateAllFrom( |
580 *http_network_session_->http_auth_cache()); | 580 *http_network_session_->http_auth_cache()); |
581 } | 581 } |
582 | 582 |
583 } // namespace gcm | 583 } // namespace gcm |
OLD | NEW |