NetLog: Move the group_name to a CONNECT_JOB's first

event.

This fixes jobs with a SOCKET_BACKUP_CREATED event as the
second event not having a description.  Also simplifies
the net-internals code slightly (Or will once backward
compatibility can be removed).

This slightly breaks compatibility of old versions of Chrome
with new log files - CONNECT_JOBs and SOCKETS from newer
versions of Chrome will not have descriptions on M25 or
earlier.

Review URL: https://chromiumcodereview.appspot.com/11583027

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

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/resources/net_internals/source_entry.js b/chrome/browser/resources/net_internals/source_entry.js
index cc3b429..b223466 100644
--- a/chrome/browser/resources/net_internals/source_entry.js
+++ b/chrome/browser/resources/net_internals/source_entry.js
@@ -202,10 +202,14 @@ var SourceEntry = (function() {
           return e;
       }
       if (this.entries_.length >= 2) {
-        if (this.entries_[0].type == EventType.SOCKET_POOL_CONNECT_JOB ||
-            this.entries_[1].type == EventType.UDP_CONNECT) {
+        // Needed for compatability with log dumps prior to M26.
+        // TODO(mmenke):  Remove this.
+        if (this.entries_[0].type == EventType.SOCKET_POOL_CONNECT_JOB &&
+            this.entries_[0].params == undefined) {
           return this.entries_[1];
         }
+        if (this.entries_[1].type == EventType.UDP_CONNECT)
+          return this.entries_[1];
         if (this.entries_[0].type == EventType.REQUEST_ALIVE &&
             this.entries_[0].params == undefined) {
           var start_index = 1;