| Index: net/proxy/proxy_script_decider.h
|
| ===================================================================
|
| --- net/proxy/proxy_script_decider.h (revision 141995)
|
| +++ net/proxy/proxy_script_decider.h (working copy)
|
| @@ -6,6 +6,7 @@
|
| #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
|
| #pragma once
|
|
|
| +#include <string>
|
| #include <vector>
|
|
|
| #include "base/memory/ref_counted.h"
|
| @@ -89,6 +90,12 @@
|
| PacSource(Type type, const GURL& url)
|
| : type(type), url(url) {}
|
|
|
| + // Returns a Value representing the PacSource. |effective_pac_url| must
|
| + // be non-NULL and point to the URL derived from information contained in
|
| + // |this|, if Type is not WPAD_DHCP.
|
| + base::Value* NetLogCallback(const GURL* effective_pac_url,
|
| + NetLog::LogLevel log_level) const;
|
| +
|
| Type type;
|
| GURL url; // Empty unless |type == PAC_SOURCE_CUSTOM|.
|
| };
|
| @@ -131,8 +138,7 @@
|
| // ProxyResolver doesn't |expect_pac_bytes()|.
|
| State GetStartState() const;
|
|
|
| - NetLogStringParameter* CreateNetLogParameterAndDetermineURL(
|
| - const PacSource& pac_source, GURL* effective_pac_url);
|
| + void DetermineURL(const PacSource& pac_source, GURL* effective_pac_url);
|
|
|
| // Returns the current PAC URL we are fetching/testing.
|
| const PacSource& current_pac_source() const;
|
|
|