Fast-fail WPAD detection.

net/proxy/proxy_script_decider.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_PROXY_PROXY_SCRIPT_DECIDER_H_
 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
+#include "net/dns/host_resolver.h"
+#include "net/dns/single_request_host_resolver.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_resolver.h"
 #include "url/gurl.h"
 
 namespace net {
 
 class DhcpProxyScriptFetcher;
 class NetLogParameter;
 class ProxyResolver;
 class ProxyScriptFetcher;
@@ skipping 68 matching lines @@
                                 NetLog::LogLevel log_level) const;
 
     Type type;
     GURL url;  // Empty unless |type == PAC_SOURCE_CUSTOM|.
   };
 
   typedef std::vector<PacSource> PacSourceList;
 
   enum State {
     STATE_NONE,
+    STATE_QUICK_CHECK,

[szym, 2013/08/23 20:45:57]

nit: these should be after STATE_WAIT

[Elly Fong-Jones, 2013/08/26 15:17:29]

Done.

+    STATE_QUICK_CHECK_COMPLETE,
     STATE_WAIT,
     STATE_WAIT_COMPLETE,
     STATE_FETCH_PAC_SCRIPT,
     STATE_FETCH_PAC_SCRIPT_COMPLETE,
     STATE_VERIFY_PAC_SCRIPT,
     STATE_VERIFY_PAC_SCRIPT_COMPLETE,
+    STATE_FAILED,
   };
 
   // Returns ordered list of PAC urls to try for |config|.
   PacSourceList BuildPacSourcesFallbackList(const ProxyConfig& config) const;
 
   void OnIOCompletion(int result);
   int DoLoop(int result);
   void DoCallback(int result);
 
+  int DoQuickCheck();

[szym, 2013/08/23 20:45:57]

nit: these should be after DoWait()

[Elly Fong-Jones, 2013/08/26 15:17:29]

Done.

+  int DoQuickCheckComplete(int result);
+
   int DoWait();
   int DoWaitComplete(int result);
 
   int DoFetchPacScript();
   int DoFetchPacScriptComplete(int result);
 
   int DoVerifyPacScript();
   int DoVerifyPacScriptComplete(int result);
 
   // Tries restarting using the next fallback PAC URL:
@@ skipping 37 matching lines @@
 
   bool fetch_pac_bytes_;
 
   base::TimeDelta wait_delay_;
   base::OneShotTimer<ProxyScriptDecider> wait_timer_;
 
   // Results.
   ProxyConfig effective_config_;
   scoped_refptr<ProxyResolverScriptData> script_data_;
 
+  AddressList wpad_addrs_;

[szym, 2013/08/23 20:45:57]

nit: wpad_addresses_

[Elly Fong-Jones, 2013/08/26 15:17:29]

Done.

+  base::OneShotTimer<ProxyScriptDecider> quick_check_timer_;
+  SingleRequestHostResolver host_resolver_;
+  base::Time quick_check_started_;

[szym, 2013/08/23 20:45:57]

nit: ...start_time_

[Elly Fong-Jones, 2013/08/26 15:17:29]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SCRIPT_DECIDER_H_