Make LoggingNetworkChangeObserver log specific network changes

net/base/logging_network_change_observer.cc

Index: net/base/logging_network_change_observer.cc
diff --git a/net/base/logging_network_change_observer.cc b/net/base/logging_network_change_observer.cc
index 871a44abbb4f08836ffd6696e245dffb48e0a70d..3f690a29d0d2e85635af9eb90d9a5633edeb8c93 100644
--- a/net/base/logging_network_change_observer.cc
+++ b/net/base/logging_network_change_observer.cc
@@ -7,52 +7,119 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
 #include "net/log/net_log.h"
 
 namespace net {
 
-LoggingNetworkChangeObserver::LoggingNetworkChangeObserver(net::NetLog* net_log)
+namespace {
+
+// Return a dictionary of values that provide information about a
+// network-specific change. This also includes relevant current state
+// like the default network, and the types of active networks.
+std::unique_ptr<base::Value> NetworkSpecificNetLogCallback(
+    NetworkChangeNotifier::NetworkHandle network,
+    NetLogCaptureMode capture_mode) {
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  dict->SetInteger("changed_network_handle", network);
+  dict->SetString(
+      "changed_network_type",
+      NetworkChangeNotifier::ConnectionTypeToString(
+          NetworkChangeNotifier::GetNetworkConnectionType(network)));
+  dict->SetInteger("default_active_network_handle",
+                   NetworkChangeNotifier::GetDefaultNetwork());
+  NetworkChangeNotifier::NetworkList networks;
+  NetworkChangeNotifier::GetConnectedNetworks(&networks);
+  for (NetworkChangeNotifier::NetworkHandle active_network : networks) {
+    dict->SetString(
+        "current_active_networks." + base::IntToString(active_network),
+        NetworkChangeNotifier::ConnectionTypeToString(
+            NetworkChangeNotifier::GetNetworkConnectionType(active_network)));
+  }
+  return std::move(dict);
+}
+
+}  // namespace
+
+LoggingNetworkChangeObserver::LoggingNetworkChangeObserver(NetLog* net_log)
     : net_log_(net_log) {
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+  NetworkChangeNotifier::AddIPAddressObserver(this);
+  NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  NetworkChangeNotifier::AddNetworkChangeObserver(this);
+  if (NetworkChangeNotifier::AreNetworkHandlesSupported())
+    NetworkChangeNotifier::AddNetworkObserver(this);
 }
 
 LoggingNetworkChangeObserver::~LoggingNetworkChangeObserver() {
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+  NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+  if (NetworkChangeNotifier::AreNetworkHandlesSupported())
+    NetworkChangeNotifier::RemoveNetworkObserver(this);
 }
 
 void LoggingNetworkChangeObserver::OnIPAddressChanged() {
   VLOG(1) << "Observed a change to the network IP addresses";
 
-  net_log_->AddGlobalEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED);
+  net_log_->AddGlobalEntry(NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED);
 }
 
 void LoggingNetworkChangeObserver::OnConnectionTypeChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
+    NetworkChangeNotifier::ConnectionType type) {
   std::string type_as_string =
-      net::NetworkChangeNotifier::ConnectionTypeToString(type);
+      NetworkChangeNotifier::ConnectionTypeToString(type);
 
   VLOG(1) << "Observed a change to network connectivity state "
           << type_as_string;
 
   net_log_->AddGlobalEntry(
-      net::NetLog::TYPE_NETWORK_CONNECTIVITY_CHANGED,
-      net::NetLog::StringCallback("new_connection_type", &type_as_string));
+      NetLog::TYPE_NETWORK_CONNECTIVITY_CHANGED,
+      NetLog::StringCallback("new_connection_type", &type_as_string));
 }
 
 void LoggingNetworkChangeObserver::OnNetworkChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
+    NetworkChangeNotifier::ConnectionType type) {
   std::string type_as_string =
-      net::NetworkChangeNotifier::ConnectionTypeToString(type);
+      NetworkChangeNotifier::ConnectionTypeToString(type);
 
   VLOG(1) << "Observed a network change to state " << type_as_string;
 
   net_log_->AddGlobalEntry(
-      net::NetLog::TYPE_NETWORK_CHANGED,
-      net::NetLog::StringCallback("new_connection_type", &type_as_string));
+      NetLog::TYPE_NETWORK_CHANGED,
+      NetLog::StringCallback("new_connection_type", &type_as_string));
+}
+
+void LoggingNetworkChangeObserver::OnNetworkConnected(
+    NetworkChangeNotifier::NetworkHandle network) {
+  VLOG(1) << "Observed network " << network << " connect";
+
+  net_log_->AddGlobalEntry(NetLog::TYPE_SPECIFIC_NETWORK_CONNECTED,
+                           base::Bind(&NetworkSpecificNetLogCallback, network));
+}
+
+void LoggingNetworkChangeObserver::OnNetworkDisconnected(
+    NetworkChangeNotifier::NetworkHandle network) {
+  VLOG(1) << "Observed network " << network << " disconnect";
+
+  net_log_->AddGlobalEntry(NetLog::TYPE_SPECIFIC_NETWORK_DISCONNECTED,
+                           base::Bind(&NetworkSpecificNetLogCallback, network));
+}
+
+void LoggingNetworkChangeObserver::OnNetworkSoonToDisconnect(
+    NetworkChangeNotifier::NetworkHandle network) {
+  VLOG(1) << "Observed network " << network << " soon to disconnect";
+
+  net_log_->AddGlobalEntry(NetLog::TYPE_SPECIFIC_NETWORK_SOON_TO_DISCONNECT,
+                           base::Bind(&NetworkSpecificNetLogCallback, network));
+}
+
+void LoggingNetworkChangeObserver::OnNetworkMadeDefault(
+    NetworkChangeNotifier::NetworkHandle network) {
+  VLOG(1) << "Observed network " << network << " made the default network";
+
+  net_log_->AddGlobalEntry(NetLog::TYPE_SPECIFIC_NETWORK_MADE_DEFAULT,
+                           base::Bind(&NetworkSpecificNetLogCallback, network));
 }
 
 }  // namespace net