Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

netlog_viewer/netlog_viewer/source_entry.js

Index: netlog_viewer/netlog_viewer/source_entry.js
diff --git a/netlog_viewer/netlog_viewer/source_entry.js b/netlog_viewer/netlog_viewer/source_entry.js
index 2c96341c470dd7f4e9787b5ff0aa6789dc89117e..6ee41bd7e2e9cdb7225936a7975018a16a58088b 100644
--- a/netlog_viewer/netlog_viewer/source_entry.js
+++ b/netlog_viewer/netlog_viewer/source_entry.js
@@ -31,8 +31,7 @@ var SourceEntry = (function() {
   SourceEntry.prototype = {
     update: function(logEntry) {
       // Only the last event should have the same type first event,
-      if (!this.isInactive_ &&
-          logEntry.phase == EventPhase.PHASE_END &&
+      if (!this.isInactive_ && logEntry.phase == EventPhase.PHASE_END &&
           logEntry.type == this.entries_[0].type) {
         this.isInactive_ = true;
       }
@@ -82,6 +81,8 @@ var SourceEntry = (function() {
         // TODO(ricea): Remove SOCKET_STREAM after M41 is released.
         case EventSourceType.SOCKET_STREAM:
         case EventSourceType.HTTP_STREAM_JOB:
+        case EventSourceType.HTTP_STREAM_JOB_CONTROLLER:
+        case EventSourceType.BIDIRECTIONAL_STREAM:
           this.description_ = e.params.url;
           break;
         // TODO(davidben): Remove CONNECT_JOB after M57 is released.
@@ -186,8 +187,10 @@ var SourceEntry = (function() {
     /**
      * Returns the starting entry for this source. Conceptually this is the
      * first entry that was logged to this source. However, we skip over the
-     * TYPE_REQUEST_ALIVE entries which wrap TYPE_URL_REQUEST_START_JOB
-     * entries.
+     * TYPE_REQUEST_ALIVE entries without parameters which wrap
+     * TYPE_URL_REQUEST_START_JOB entries.  (TYPE_REQUEST_ALIVE may or may not
+     * have parameters depending on what version of Chromium they were
+     * generated from.)
      */
     getStartEntry_: function() {
       if (this.entries_.length < 1)
@@ -199,8 +202,7 @@ var SourceEntry = (function() {
       }
       if (this.entries_[0].source.type == EventSourceType.DOWNLOAD) {
         // If any rename occurred, use the last name
-        e = this.findLastLogEntryStartByType_(
-            EventType.DOWNLOAD_FILE_RENAMED);
+        e = this.findLastLogEntryStartByType_(EventType.DOWNLOAD_FILE_RENAMED);
         if (e != undefined)
           return e;
         // Otherwise, if the file was opened, use that name
@@ -343,10 +345,10 @@ var SourceEntry = (function() {
      */
     createTablePrinter: function() {
       return createLogEntryTablePrinter(
-          this.entries_,
-          SourceTracker.getInstance().getPrivacyStripping(),
+          this.entries_, SourceTracker.getInstance().getPrivacyStripping(),
           SourceTracker.getInstance().getUseRelativeTimes() ?
-              timeutil.getBaseTime() : 0,
+              timeutil.getBaseTime() :
+              0,
           Constants.clientInfo.numericDate);
     },
   };