4 files changed, 16 insertions, 7 deletions

diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index c491a309..a3222b7 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -160,7 +160,8 @@ int IntranetRedirectHostResolverProc::Resolve(
     const std::string& host,
     net::AddressFamily address_family,
     net::HostResolverFlags host_resolver_flags,
-    net::AddressList* addrlist) {
+    net::AddressList* addrlist,
+    int* os_error) {
   // We'd love to just ask the IntranetRedirectDetector, but we may not be on
   // the same thread.  So just use the heuristic that any all-lowercase a-z
   // hostname with the right number of characters is likely from the detector
@@ -169,5 +170,6 @@ int IntranetRedirectHostResolverProc::Resolve(
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
-      ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist);
+      ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist,
+                           os_error);
 }
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 3ab75a0..e939eae5 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -101,7 +101,8 @@ class IntranetRedirectHostResolverProc : public net::HostResolverProc {
   virtual int Resolve(const std::string& host,
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
-                      net::AddressList* addrlist);
+                      net::AddressList* addrlist,
+                      int* os_error);
 };
 
 #endif  // CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
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;
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 99747f8..9defe5b 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -55,7 +55,8 @@ class WarningHostResolverProc : public net::HostResolverProc {
   virtual int Resolve(const std::string& host,
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
-                      net::AddressList* addrlist) {
+                      net::AddressList* addrlist,
+                      int* os_error) {
     const char* kLocalHostNames[] = {"localhost", "127.0.0.1"};
     bool local = false;
 
@@ -75,7 +76,7 @@ class WarningHostResolverProc : public net::HostResolverProc {
     EXPECT_TRUE(local) << "Making external DNS lookup of " << host;
 
     return ResolveUsingPrevious(host, address_family, host_resolver_flags,
-                                addrlist);
+                                addrlist, os_error);
   }
 };