Log the OS error that getaddrinfo() failed with.

- Display it on the about:net-internals page
- Collect it in the histogram Net.OSErrorsForGetAddrinfo.

Review URL: http://codereview.chromium.org/2134004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47386 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/chrome/browser/resources/net_internals/logviewpainter.js b/chrome/browser/resources/net_internals/logviewpainter.js
index d0dc90b..8d45c2f 100644
--- a/chrome/browser/resources/net_internals/logviewpainter.js
+++ b/chrome/browser/resources/net_internals/logviewpainter.js
@@ -46,7 +46,9 @@ PrintSourceEntriesAsText = function(sourceEntries) {
     var entry = entries[i];
 
     // Avoid printing the END for a BEGIN that was immediately before.
-    if (entry.isEnd() && entry.begin && entry.begin.index == i - 1) {
+    // (Except if the END contains any extra parameters).
+    if (entry.isEnd() && !entry.orig.params && entry.begin &&
+        entry.begin.index == i - 1) {
       continue;
     }
 
@@ -153,7 +155,10 @@ function getTextForResponseHeadersExtraParam(entry) {
 function getTextForEvent(entry) {
   var text = '';
 
-  if (entry.isBegin()) {
+  if (entry.isBegin() && entry.end && entry.end.index == entry.index + 1) {
+    // Don't prefix with '+' if we are going to collapse the END event.
+    text = ' ';
+  } else if (entry.isBegin()) {
     text = '+' + text;
   } else if (entry.isEnd()) {
     text = '-' + text;