Add a source id to global NetLog entries, which makes them

easier to sort in about:net-internals, making the world a
happier, fuzzier place.

Also slightly simplifies the functions to add NetLog entries,
and makes it impossible to create a BoundNetLog with both an
invalid source and a non-NULL NetLog.

BUG=116597
Review URL: https://chromiumcodereview.appspot.com/9585026

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

5 files changed, 18 insertions, 18 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 8d561bc..dea9201 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -183,11 +183,8 @@ class LoggingNetworkChangeObserver
   virtual void OnIPAddressChanged() {
     VLOG(1) << "Observed a change to the network IP addresses";
 
-    net_log_->AddEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED,
-                       base::TimeTicks::Now(),
-                       net::NetLog::Source(),
-                       net::NetLog::PHASE_NONE,
-                       NULL);
+    net_log_->AddGlobalEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED,
+                             NULL);
   }
 
  private:
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc
index 379f60a..fb6ccf8 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/chrome/browser/net/chrome_net_log.cc
@@ -49,11 +49,13 @@ ChromeNetLog::~ChromeNetLog() {
     RemoveThreadSafeObserver(net_log_logger_.get());
 }
 
-void ChromeNetLog::AddEntry(EventType type,
-                            const base::TimeTicks& time,
-                            const Source& source,
-                            EventPhase phase,
-                            EventParameters* params) {
+void ChromeNetLog::AddEntry(
+    EventType type,
+    const Source& source,
+    EventPhase phase,
+    const scoped_refptr<EventParameters>& params) {
+  base::TimeTicks time(base::TimeTicks::Now());
+
   base::AutoLock lock(lock_);
 
   // Notify all of the log observers.
diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h
index 5335b33..e297d33 100644
--- a/chrome/browser/net/chrome_net_log.h
+++ b/chrome/browser/net/chrome_net_log.h
@@ -28,11 +28,6 @@ class ChromeNetLog : public net::NetLog {
   virtual ~ChromeNetLog();
 
   // NetLog implementation:
-  virtual void AddEntry(EventType type,
-                        const base::TimeTicks& time,
-                        const Source& source,
-                        EventPhase phase,
-                        EventParameters* params) OVERRIDE;
   virtual uint32 NextID() OVERRIDE;
   virtual LogLevel GetLogLevel() const OVERRIDE;
   virtual void AddThreadSafeObserver(ThreadSafeObserver* observer,
@@ -46,6 +41,12 @@ class ChromeNetLog : public net::NetLog {
   }
 
  private:
+  // NetLog implementation:
+  virtual void AddEntry(EventType type,
+                        const Source& source,
+                        EventPhase phase,
+                        const scoped_refptr<EventParameters>& params) OVERRIDE;
+
   // Called whenever an observer is added or removed, or has its log level
   // changed.  Must have acquired |lock_| prior to calling.
   void UpdateLogLevel();
diff --git a/chrome/browser/net/chrome_net_log_unittest.cc b/chrome/browser/net/chrome_net_log_unittest.cc
index a8c5b15..d04dfb7 100644
--- a/chrome/browser/net/chrome_net_log_unittest.cc
+++ b/chrome/browser/net/chrome_net_log_unittest.cc
@@ -37,9 +37,7 @@ class CountingObserver : public net::NetLog::ThreadSafeObserver {
 };
 
 void AddEvent(ChromeNetLog* net_log) {
-  net::NetLog::Source source(net::NetLog::SOURCE_SOCKET, net_log->NextID());
-  net_log->AddEntry(net::NetLog::TYPE_SOCKET_ALIVE, base::TimeTicks(),
-                    source, net::NetLog::PHASE_BEGIN, NULL);
+  net_log->AddGlobalEntry(net::NetLog::TYPE_CANCELLED, NULL);
 }
 
 // A thread that waits until an event has been signalled before calling
diff --git a/chrome/browser/resources/net_internals/source_tracker.js b/chrome/browser/resources/net_internals/source_tracker.js
index 7220a3f..c5e0e6d 100644
--- a/chrome/browser/resources/net_internals/source_tracker.js
+++ b/chrome/browser/resources/net_internals/source_tracker.js
@@ -89,6 +89,8 @@ var SourceTracker = (function() {
         var logEntry = logEntries[e];
 
         // Assign unique ID, if needed.
+        // TODO(mmenke):  Remove this, and all other code to handle 0 source
+        //                IDs when M19 hits stable.
         if (logEntry.source.id == 0) {
           logEntry.source.id = this.nextSourcelessEventId_;
           --this.nextSourcelessEventId_;