Extracted NetLog class's inner enum types into their own enum classes and

google_apis/gcm/engine/connection_factory_impl.cc

 // Copyright (c) 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.
 
 #include "google_apis/gcm/engine/connection_factory_impl.h"
 
 #include <string>
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "google_apis/gcm/engine/connection_handler_impl.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/log/net_log.h"
+#include "net/log/net_log_source_type.h"
 #include "net/proxy/proxy_info.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace gcm {
 
 namespace {
 
 // The amount of time a Socket read should wait before timing out.
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 ConnectionFactoryImpl::ConnectionFactoryImpl(
     const std::vector<GURL>& mcs_endpoints,
     const net::BackoffEntry::Policy& backoff_policy,
     net::HttpNetworkSession* gcm_network_session,
     net::HttpNetworkSession* http_network_session,
     net::NetLog* net_log,
     GCMStatsRecorder* recorder)
-  : mcs_endpoints_(mcs_endpoints),
-    next_endpoint_(0),
-    last_successful_endpoint_(0),
-    backoff_policy_(backoff_policy),
-    gcm_network_session_(gcm_network_session),
-    http_network_session_(http_network_session),
-    bound_net_log_(
-        net::BoundNetLog::Make(net_log, net::NetLog::SOURCE_SOCKET)),
-    pac_request_(NULL),
-    connecting_(false),
-    waiting_for_backoff_(false),
-    waiting_for_network_online_(false),
-    logging_in_(false),
-    recorder_(recorder),
-    listener_(NULL),
-    weak_ptr_factory_(this) {
+    : mcs_endpoints_(mcs_endpoints),
+      next_endpoint_(0),
+      last_successful_endpoint_(0),
+      backoff_policy_(backoff_policy),
+      gcm_network_session_(gcm_network_session),
+      http_network_session_(http_network_session),
+      bound_net_log_(
+          net::BoundNetLog::Make(net_log, net::NetLogSourceType::SOCKET)),
+      pac_request_(NULL),
+      connecting_(false),
+      waiting_for_backoff_(false),
+      waiting_for_network_online_(false),
+      logging_in_(false),
+      recorder_(recorder),
+      listener_(NULL),
+      weak_ptr_factory_(this) {
   DCHECK_GE(mcs_endpoints_.size(), 1U);
   DCHECK(!http_network_session_ ||
          (gcm_network_session_ != http_network_session_));
 }
 
 ConnectionFactoryImpl::~ConnectionFactoryImpl() {
   CloseSocket();
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   if (pac_request_) {
     gcm_network_session_->proxy_service()->CancelPacRequest(pac_request_);
@@ skipping 490 matching lines @@
 
 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() {
   if (!http_network_session_ || !http_network_session_->http_auth_cache())
     return;
 
   gcm_network_session_->http_auth_cache()->UpdateAllFrom(
       *http_network_session_->http_auth_cache());
 }
 
 }  // namespace gcm