Adds a NetworkChangeNotifier dependency to ProxyService; when we observer a n...

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>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/waitable_event.h"
 #include "net/base/completion_callback.h"
+#include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_server.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class GURL;
 class MessageLoop;
 class URLRequestContext;
 
 namespace net {
 
 class InitProxyResolver;
 class LoadLog;
 class ProxyConfigService;
 class ProxyResolver;
 class ProxyScriptFetcher;
 
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
-class ProxyService : public base::RefCountedThreadSafe<ProxyService> {
+class ProxyService : public base::RefCountedThreadSafe<ProxyService>,
+                     public NetworkChangeNotifier::Observer {
  public:
   // The instance takes ownership of |config_service| and |resolver|.
-  ProxyService(ProxyConfigService* config_service, ProxyResolver* 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);
 
   // 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 71 matching lines @@
     return config_;
   }
 
   // Creates a proxy service that polls |proxy_config_service| to notice when
   // the proxy settings change. We take ownership of |proxy_config_service|.
   // Iff |use_v8_resolver| is true, then the V8 implementation is
   // used.
   // |url_request_context| is only used when use_v8_resolver is true:
   // it specifies the URL request context that will be used if a PAC
   // script needs to be fetched.
+  // |network_change_notifier| may be NULL. Otherwise it will be used to
+  // signal the ProxyService when the network setup has changed.
   // |io_loop| points to the IO thread's message loop. It is only used
   // when pc is NULL.
   // ##########################################################################
   // # 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,
       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 81 matching lines @@
 
   // Returns true if the URL passed in should not go through the proxy server.
   // 1. If the proxy settings say to bypass local names, and |IsLocalName(url)|.
   // 2. The URL matches one of the entities in the proxy bypass list.
   bool ShouldBypassProxyForURL(const GURL& url);
 
   // Returns true if |url| is to an intranet site (using non-FQDN as the
   // heuristic).
   static bool IsLocalName(const GURL& url);
 
+  // NetworkChangeNotifier::Observer methods:
+  virtual void OnIPAddressChanged();
+
   scoped_ptr<ProxyConfigService> config_service_;
   scoped_ptr<ProxyResolver> resolver_;
 
   // We store the proxy config and a counter (ID) that is incremented each time
   // the config changes.
   ProxyConfig config_;
 
   // Increasing ID to give to the next ProxyConfig that we set.
   int next_config_id_;
 
@@ skipping 19 matching lines @@
 
   // 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.
   scoped_refptr<LoadLog> init_proxy_resolver_log_;
 
+  // The (possibly NULL) network change notifier that we use to decide when
+  // to refetch PAC scripts or re-run WPAD.
+  scoped_refptr<NetworkChangeNotifier> network_change_notifier_;
+
   DISALLOW_COPY_AND_ASSIGN(ProxyService);
 };
 
 // Wrapper for invoking methods on a ProxyService synchronously.
 class SyncProxyServiceHelper
     : public base::RefCountedThreadSafe<SyncProxyServiceHelper> {
  public:
   SyncProxyServiceHelper(MessageLoop* io_message_loop,
                          ProxyService* proxy_service);
 
@@ skipping 16 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_