Adds HostResolveImpl Requests and Jobs to log.

net/base/host_resolver_impl.h

 // Copyright (c) 2010 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_HOST_RESOLVER_IMPL_H_
 #define NET_BASE_HOST_RESOLVER_IMPL_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 57 matching lines @@
   //
   // If |cache| is NULL, then no caching is used. Otherwise we take
   // ownership of the |cache| pointer, and will free it during destructor.
   //
   // |resolver_proc| is used to perform the actual resolves; it must be
   // thread-safe since it is run from multiple worker threads. If
   // |resolver_proc| is NULL then the default host resolver procedure is
   // used (which is SystemHostResolverProc except if overridden).
   // |max_jobs| specifies the maximum number of threads that the host resolver
   // will use. Use SetPoolConstraints() to specify finer-grain settings.
+  //
+  // |net_log| must remain valid for the life of the HostResolverImpl.
   HostResolverImpl(HostResolverProc* resolver_proc,
                    HostCache* cache,
-                   size_t max_jobs);
+                   size_t max_jobs,
+                   NetLog* net_log);
 
   // HostResolver methods:
   virtual int Resolve(const RequestInfo& info,
                       AddressList* addresses,
                       CompletionCallback* callback,
                       RequestHandle* out_req,
-                      const BoundNetLog& net_log);
+                      const BoundNetLog& source_net_log);
   virtual void CancelRequest(RequestHandle req);
   virtual void AddObserver(HostResolver::Observer* observer);
   virtual void RemoveObserver(HostResolver::Observer* observer);
 
   // Set address family, and disable IPv6 probe support.
   virtual void SetDefaultAddressFamily(AddressFamily address_family);
 
   // Continuously observe whether IPv6 is supported, and set the allowable
   // address family to IPv4 iff IPv6 is not supported.
   void ProbeIPv6Support();
@@ skipping 49 matching lines @@
   Job* FindOutstandingJob(const Key& key);
 
   // Removes |job| from the outstanding jobs list.
   void RemoveOutstandingJob(Job* job);
 
   // Callback for when |job| has completed with |net_error| and |addrlist|.
   void OnJobComplete(Job* job, int net_error, int os_error,
                      const AddressList& addrlist);
 
   // Called when a request has just been started.
-  void OnStartRequest(const BoundNetLog& net_log,
+  void OnStartRequest(const BoundNetLog& source_net_log,
+                      const BoundNetLog& request_net_log,
                       int request_id,
                       const RequestInfo& info);
 
   // Called when a request has just completed (before its callback is run).
-  void OnFinishRequest(const BoundNetLog& net_log,
+  void OnFinishRequest(const BoundNetLog& source_net_log,
+                       const BoundNetLog& request_net_log,
                        int request_id,
                        const RequestInfo& info,
                        int net_error,
-                       int os_error,
-                       bool was_from_cache);
+                       int os_error);
 
   // Called when a request has been cancelled.
-  void OnCancelRequest(const BoundNetLog& net_log,
+  void OnCancelRequest(const BoundNetLog& source_net_log,
+                       const BoundNetLog& request_net_log,
                        int request_id,
                        const RequestInfo& info);
 
   // NetworkChangeNotifier::Observer methods:
   virtual void OnIPAddressChanged();
 
   // Notify IPv6ProbeJob not to call back, and discard reference to the job.
   void DiscardIPv6ProbeJob();
 
   // Callback from IPv6 probe activity.
@@ skipping 67 matching lines @@
   // family.
   // When false, explicit setting of address family is used.
   bool ipv6_probe_monitoring_;
 
   // The last un-cancelled IPv6ProbeJob (if any).
   scoped_refptr<IPv6ProbeJob> ipv6_probe_job_;
 
   // Any resolver flags that should be added to a request by default.
   HostResolverFlags additional_resolver_flags_;
 
+  NetLog* net_log_;
+
   DISALLOW_COPY_AND_ASSIGN(HostResolverImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_IMPL_H_