net: rename BoundNetLog to NetLogWithSource

net/log/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_LOG_NET_LOG_H_
 #define NET_LOG_NET_LOG_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 19 matching lines @@
 }
 
 namespace net {
 
 // NetLog is the destination for log messages generated by the network stack.
 // Each log message has a "source" field which identifies the specific entity
 // that generated the message (for example, which URLRequest or which
 // SpdySession).
 //
 // To avoid needing to pass in the "source ID" to the logging functions, NetLog
-// is usually accessed through a BoundNetLog, which will always pass in a
+// is usually accessed through a NetLogWithSource, which will always pass in a
 // specific source ID.
 //
 // All methods are thread safe, with the exception that no NetLog or
 // NetLog::ThreadSafeObserver functions may be called by an observer's
 // OnAddEntry() method.  Doing so will result in a deadlock.
 //
 // For a broader introduction see the design document:
 // https://sites.google.com/a/chromium.org/dev/developers/design-documents/network-stack/netlog
 class NET_EXPORT NetLog {
  public:
@@ skipping 217 matching lines @@
   // Warning: |name| and |value| must remain valid for the life of the callback.
   static ParametersCallback StringCallback(const char* name,
                                            const std::string* value);
   static ParametersCallback StringCallback(const char* name, const char* value);
 
   // Same as above, but takes in a UTF16 string.
   static ParametersCallback StringCallback(const char* name,
                                            const base::string16* value);
 
  private:
-  friend class BoundNetLog;
+  friend class NetLogWithSource;
 
   void AddEntry(NetLogEventType type,
                 const Source& source,
                 NetLogEventPhase phase,
                 const NetLog::ParametersCallback* parameters_callback);
 
   // Called whenever an observer is added or removed, to update
   // |has_observers_|. Must have acquired |lock_| prior to calling.
   void UpdateIsCapturing();
 
   // |lock_| protects access to |observers_|.
   base::Lock lock_;
 
   // Last assigned source ID.  Incremented to get the next one.
   base::subtle::Atomic32 last_id_;
 
   // |is_capturing_| will be 0 when there are no observers watching the NetLog,
   // 1 otherwise. Note that this is stored as an Atomic32 rather than a boolean
   // so it can be accessed without needing a lock.
   base::subtle::Atomic32 is_capturing_;
 
   // |lock_| must be acquired whenever reading or writing to this.
   base::ObserverList<ThreadSafeObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLog);
 };
 
 // Helper that binds a Source to a NetLog, and exposes convenience methods to
 // output log messages without needing to pass in the source.
-class NET_EXPORT BoundNetLog {
+class NET_EXPORT NetLogWithSource {
  public:
-  BoundNetLog() : net_log_(NULL) {}
-  ~BoundNetLog();
+  NetLogWithSource() : net_log_(NULL) {}
+  ~NetLogWithSource();
 
   // Add a log entry to the NetLog for the bound source.
   void AddEntry(NetLogEventType type, NetLogEventPhase phase) const;
   void AddEntry(NetLogEventType type,
                 NetLogEventPhase phase,
                 const NetLog::ParametersCallback& get_parameters) const;
 
   // Convenience methods that call AddEntry with a fixed "capture phase"
   // (begin, end, or none).
   void BeginEvent(NetLogEventType type) const;
@@ skipping 23 matching lines @@
                                 int net_error) const;
 
   // Logs a byte transfer event to the NetLog.  Determines whether to log the
   // received bytes or not based on the current logging level.
   void AddByteTransferEvent(NetLogEventType event_type,
                             int byte_count,
                             const char* bytes) const;
 
   bool IsCapturing() const;
 
-  // Helper to create a BoundNetLog given a NetLog and a NetLogSourceType.
+  // Helper to create a NetLogWithSource given a NetLog and a NetLogSourceType.
   // Takes care of creating a unique source ID, and handles
   //  the case of NULL net_log.
-  static BoundNetLog Make(NetLog* net_log, NetLogSourceType source_type);
+  static NetLogWithSource Make(NetLog* net_log, NetLogSourceType source_type);
 
   const NetLog::Source& source() const { return source_; }
   NetLog* net_log() const { return net_log_; }
 
  private:
   // TODO(eroman): Temporary until crbug.com/467797 is solved.
   enum Liveness {
     ALIVE = 0xCA11AB13,
     DEAD = 0xDEADBEEF,
   };
 
-  BoundNetLog(const NetLog::Source& source, NetLog* net_log)
+  NetLogWithSource(const NetLog::Source& source, NetLog* net_log)
       : source_(source), net_log_(net_log) {}
 
   // TODO(eroman): Temporary until crbug.com/467797 is solved.
   void CrashIfInvalid() const;
 
   NetLog::Source source_;
   NetLog* net_log_;
 
   // TODO(eroman): Temporary until crbug.com/467797 is solved.
   Liveness liveness_ = ALIVE;
 };
 
 }  // namespace net
 
 #endif  // NET_LOG_NET_LOG_H_