Add a source id to global NetLog entries.

net/base/capturing_net_log.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_CAPTURING_NET_LOG_H_
 #define NET_BASE_CAPTURING_NET_LOG_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 39 matching lines @@
   virtual ~CapturingNetLog();
 
   // Returns the list of all entries in the log.
   void GetEntries(EntryList* entry_list) const;
 
   void Clear();
 
   void SetLogLevel(NetLog::LogLevel log_level);
 
   // NetLog implementation:
-  virtual void AddEntry(EventType type,
-                        const base::TimeTicks& time,
-                        const Source& source,
-                        EventPhase phase,
-                        EventParameters* extra_parameters) OVERRIDE;
+  virtual void AddEntry(
+      EventType type,
+      const Source& source,
+      EventPhase phase,
+      const scoped_refptr<EventParameters>& extra_parameters) OVERRIDE;
   virtual uint32 NextID() OVERRIDE;
   virtual LogLevel GetLogLevel() const OVERRIDE;
   virtual void AddThreadSafeObserver(ThreadSafeObserver* observer,
                                      LogLevel log_level) OVERRIDE;
   virtual void SetObserverLogLevel(ThreadSafeObserver* observer,
                                    LogLevel log_level) OVERRIDE;
   virtual void RemoveThreadSafeObserver(ThreadSafeObserver* observer) OVERRIDE;
 
  private:
   // Needs to be "mutable" so can use it in GetEntries().
@@ skipping 10 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CapturingNetLog);
 };
 
 // Helper class that exposes a similar API as BoundNetLog, but uses a
 // CapturingNetLog rather than the more generic NetLog.
 //
 // CapturingBoundNetLog can easily be converted to a BoundNetLog using the
 // bound() method.
 class NET_EXPORT_PRIVATE CapturingBoundNetLog {
  public:
-  CapturingBoundNetLog(const NetLog::Source& source, CapturingNetLog* net_log);
-
   explicit CapturingBoundNetLog(size_t max_num_entries);
 
   ~CapturingBoundNetLog();
 
   // The returned BoundNetLog is only valid while |this| is alive.
   BoundNetLog bound() const {
-    return BoundNetLog(source_, capturing_net_log_.get());
+    // The source type doesn't matter, since we only use |this| for a single
+    // source, and pull the results directly from |this|.
+    return BoundNetLog::Make(capturing_net_log_.get(),
+                             net::NetLog::SOURCE_NONE);

[eroman, 2012/03/14 21:53:48]

I think we should preserve the Source for generality. Consumer might still want
to inspect the results and expect to see the Source (Since EntryList* still has
it).

[mmenke, 2012/03/14 22:25:23]

Ahh, good point.  Done.

   }
 
   // Fills |entry_list| with all entries in the log.
   void GetEntries(CapturingNetLog::EntryList* entry_list) const;
 
   void Clear();
 
   // Sets the log level of the underlying CapturingNetLog.
   void SetLogLevel(NetLog::LogLevel log_level);
 
  private:
-  NetLog::Source source_;
   scoped_ptr<CapturingNetLog> capturing_net_log_;

[eroman, 2012/03/14 21:53:48]

Could make this into an instance now.

[mmenke, 2012/03/14 22:25:23]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(CapturingBoundNetLog);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_CAPTURING_NET_LOG_H_