Adds Winsock service providers to log dumps...

chrome/browser/resources/net_internals/serviceprovidersview.js

Index: chrome/browser/resources/net_internals/serviceprovidersview.js
===================================================================
--- chrome/browser/resources/net_internals/serviceprovidersview.js	(revision 59945)
+++ chrome/browser/resources/net_internals/serviceprovidersview.js	(working copy)
@@ -32,16 +32,77 @@
 inherits(ServiceProvidersView, DivView);
 
 ServiceProvidersView.prototype.onServiceProvidersChanged =
-    function(serviceProviders) {
+function(serviceProviders) {
   this.updateServiceProviders_(serviceProviders["service_providers"]);
   this.updateNamespaceProviders_(serviceProviders["namespace_providers"]);
 };
 
 /**
+ * Returns type of a layered service provider.
+ */
+ServiceProvidersView.getLayeredServiceProviderType =
+function(serviceProvider) {
+  if (serviceProvider.chain_length == 0)
+    return 'Layer';
+  if (serviceProvider.chain_length == 1)
+    return 'Base';
+  return 'Chain';
+};
+
+ServiceProvidersView.namespaceProviderType_ = {
+  '12': 'NS_DNS',
+  '15': 'NS_NLA',
+  '16': 'NS_BTH',
+  '32': 'NS_NTDS',
+  '37': 'NS_EMAIL',
+  '38': 'NS_PNRPNAME',
+  '39': 'NS_PNRPCLOUD'
+};
+
+/**
+ * Returns the type of a namespace provider as a string.
+ */
+ServiceProvidersView.getNamespaceProviderType = function(namespaceProvider) {
+  return tryGetValueWithKey(ServiceProvidersView.namespaceProviderType_,
+                            namespaceProvider.type);
+};
+
+ServiceProvidersView.socketType_ = {
+  '1': 'SOCK_STREAM',
+  '2': 'SOCK_DGRAM',
+  '3': 'SOCK_RAW',
+  '4': 'SOCK_RDM',
+  '5': 'SOCK_SEQPACKET'
+};
+
+/**
+ * Returns socket type of a layered service provider as a string.
+ */
+ServiceProvidersView.getSocketType = function(layeredServiceProvider) {
+  return tryGetValueWithKey(ServiceProvidersView.socketType_,
+                            layeredServiceProvider.socket_type);
+};
+
+ServiceProvidersView.protocolType_ = {
+  '1': 'IPPROTO_ICMP',
+  '6': 'IPPROTO_TCP',
+  '17': 'IPPROTO_UDP',
+  '58': 'IPPROTO_ICMPV6'
+};
+
+/**
+ * Returns protocol type of a layered service provider as a string.
+ */
+ServiceProvidersView.getProtocolType = function(layeredServiceProvider) {
+  return tryGetValueWithKey(ServiceProvidersView.protocolType_,
+                            layeredServiceProvider.socket_protocol);
+};
+
+ /**
  * Updates the table of layered service providers.
  */
 ServiceProvidersView.prototype.updateServiceProviders_ =
-    function(serviceProviders) {
+function(serviceProviders) {
   this.serviceProvidersTbody_.innerHTML = '';
 
   // Add a table row for each service provider.
@@ -51,35 +112,19 @@
 
     addNodeWithText(tr, 'td', entry.name);
     addNodeWithText(tr, 'td', entry.version);
-
-    if (entry.chain_length == 0)
-      addNodeWithText(tr, 'td', 'Layer');
-    else if (entry.chain_length == 1)
-      addNodeWithText(tr, 'td', 'Base');
-    else
-      addNodeWithText(tr, 'td', 'Chain');
-
-    addNodeWithText(tr, 'td', entry.socket_type);
-    addNodeWithText(tr, 'td', entry.socket_protocol);
+    addNodeWithText(tr, 'td',
+                    ServiceProvidersView.getLayeredServiceProviderType(entry));
+    addNodeWithText(tr, 'td', ServiceProvidersView.getSocketType(entry));
+    addNodeWithText(tr, 'td', ServiceProvidersView.getProtocolType(entry));
     addNodeWithText(tr, 'td', entry.path);
   }
 };
 
-ServiceProvidersView.namespaceProviderType_ = {
-  '12': 'NS_DNS',
-  '15': 'NS_NLA',
-  '16': 'NS_BTH',
-  '32': 'NS_NTDS',
-  '37': 'NS_EMAIL',
-  '38': 'NS_PNRPNAME',
-  '39': 'NS_PNRPCLOUD'
-};
-
 /**
  * Updates the lable of namespace providers.
  */
 ServiceProvidersView.prototype.updateNamespaceProviders_ =
-    function(namespaceProviders) {
+function(namespaceProviders) {
   this.namespaceProvidersTbody_.innerHTML = '';
 
   // Add a table row for each namespace provider.
@@ -88,13 +133,8 @@
     var entry = namespaceProviders[i];
     addNodeWithText(tr, 'td', entry.name);
     addNodeWithText(tr, 'td', entry.version);
-
-    var typeString = ServiceProvidersView.namespaceProviderType_[entry.type];
-    if (typeString)
-      addNodeWithText(tr, 'td', typeString);
-    else
-      addNodeWithText(tr, 'td', entry.type);
-
+    addNodeWithText(tr, 'td',
+                    ServiceProvidersView.getNamespaceProviderType(entry));
     addNodeWithText(tr, 'td', entry.active);
   }
 };