Move over another legacy "LoadLog-style" event generator to routing its messa...

net/proxy/proxy_service.h

 // Copyright (c) 2009 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_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
 class ProxyService : public base::RefCountedThreadSafe<ProxyService>,
                      public NetworkChangeNotifier::Observer {
  public:
   // The instance takes ownership of |config_service| and |resolver|.
   // If |network_change_notifier| is non-NULL, the proxy service will register
   // with it to detect when the network setup has changed. This is used to
   // decide when to re-configure the proxy discovery.
   ProxyService(ProxyConfigService* config_service, ProxyResolver* resolver,
-               NetworkChangeNotifier* network_change_notifier);
+               NetworkChangeNotifier* network_change_notifier,
+               const BoundNetLog& init_proxy_resolver_log);
 
   // Used internally to handle PAC queries.
   // TODO(eroman): consider naming this simply "Request".
   class PacRequest;
 
   // Returns ERR_IO_PENDING if the proxy information could not be provided
   // synchronously, to indicate that the result will be available when the
   // callback is run.  The callback is run on the thread that calls
   // ResolveProxy.
   //
@@ skipping 47 matching lines @@
   // Tells this ProxyService to start using a new ProxyConfigService to
   // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
   // be queried for new config info which will be used for all subsequent
   // ResolveProxy calls. ProxyService takes ownership of
   // |new_proxy_config_service|.
   void ResetConfigService(ProxyConfigService* new_proxy_config_service);
 
   // Tells the resolver to purge any memory it does not need.
   void PurgeMemory();
 
-  // Returns the log for the most recent WPAD + PAC initialization.
-  // (This shows how much time was spent downloading and parsing the
-  // PAC scripts for the current configuration).
-  const CapturingBoundNetLog& init_proxy_resolver_log() const {
-    return init_proxy_resolver_log_;
-  }
-
   // Returns true if we have called UpdateConfig() at least once.
   bool config_has_been_initialized() const {
     return config_.id() != ProxyConfig::INVALID_ID;
   }
 
   // Returns the last configuration fetched from ProxyConfigService.
   const ProxyConfig& config() {
     return config_;
   }
 
@@ skipping 26 matching lines @@
   // ##########################################################################
   // # See the warnings in net/proxy/proxy_resolver_v8.h describing the
   // # multi-threading model. In order for this to be safe to use, *ALL* the
   // # other V8's running in the process must use v8::Locker.
   // ##########################################################################
   static ProxyService* Create(
       ProxyConfigService* proxy_config_service,
       bool use_v8_resolver,
       URLRequestContext* url_request_context,
       NetworkChangeNotifier* network_change_notifier,
+      NetLog* net_log,
       MessageLoop* io_loop);
 
   // Convenience method that creates a proxy service using the
   // specified fixed settings. |pc| must not be NULL.
   static ProxyService* CreateFixed(const ProxyConfig& pc);
 
   // Creates a proxy service that always fails to fetch the proxy configuration,
   // so it falls back to direct connect.
   static ProxyService* CreateNull();
 
@@ skipping 105 matching lines @@
 
   // Callback for when |init_proxy_resolver_| is done.
   CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
 
   // Helper to download the PAC script (wpad + custom) and apply fallback rules.
   //
   // Note that the declaration is important here: |proxy_script_fetcher_| and
   // |proxy_resolver_| must outlive |init_proxy_resolver_|.
   scoped_ptr<InitProxyResolver> init_proxy_resolver_;
 
-  // Log from the *last* time |init_proxy_resolver_.Init()| was called, or NULL.
-  CapturingBoundNetLog init_proxy_resolver_log_;
+  // Log for events generated by |init_proxy_resolver_|.
+  BoundNetLog init_proxy_resolver_log_;
 
   // The (possibly NULL) network change notifier that we use to decide when
   // to refetch PAC scripts or re-run WPAD.
   NetworkChangeNotifier* const network_change_notifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyService);
 };
 
 // Wrapper for invoking methods on a ProxyService synchronously.
 class SyncProxyServiceHelper
@@ skipping 21 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_