summaryrefslogtreecommitdiffstats
path: root/net/proxy/dhcp_proxy_script_fetcher_win.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 14:26:30 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 14:26:30 +0000
commit8d6bc14ce560d5549ee0e0c6784bd0f8f48757d6 (patch)
treefb0f81e9d918929807f6ff0b502f601c6d1fd4f5 /net/proxy/dhcp_proxy_script_fetcher_win.h
parent5b52ad495b1afcfb6c71259cfa8e18dec60378aa (diff)
downloadchromium_src-8d6bc14ce560d5549ee0e0c6784bd0f8f48757d6.zip
chromium_src-8d6bc14ce560d5549ee0e0c6784bd0f8f48757d6.tar.gz
chromium_src-8d6bc14ce560d5549ee0e0c6784bd0f8f48757d6.tar.bz2
Fix scope issues in DHCP WPAD code pointed out by jar@.
BUG=none TEST=net_unittests Review URL: http://codereview.chromium.org/7064028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/dhcp_proxy_script_fetcher_win.h')
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h
index fc96e19..a220f56 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
@@ -44,11 +44,9 @@ class NET_TEST DhcpProxyScriptFetcherWin
static bool GetCandidateAdapterNames(std::set<std::string>* adapter_names);
protected:
- // Event/state transition handlers
- void CancelImpl();
- void OnFetcherDone(int result);
- void OnWaitTimer();
- void TransitionToDone();
+ int num_pending_fetchers() const;
+
+ URLRequestContext* url_request_context() const;
// Virtual methods introduced to allow unit testing.
virtual DhcpProxyScriptAdapterFetcher* ImplCreateAdapterFetcher();
@@ -56,6 +54,13 @@ class NET_TEST DhcpProxyScriptFetcherWin
std::set<std::string>* adapter_names);
virtual int ImplGetMaxWaitMs();
+ private:
+ // Event/state transition handlers
+ void CancelImpl();
+ void OnFetcherDone(int result);
+ void OnWaitTimer();
+ void TransitionToDone();
+
// This is the outer state machine for fetching PAC configuration from
// DHCP. It relies for sub-states on the state machine of the
// DhcpProxyScriptAdapterFetcher class.
@@ -117,9 +122,6 @@ class NET_TEST DhcpProxyScriptFetcherWin
scoped_refptr<URLRequestContext> url_request_context_;
- private:
- // TODO(joi): Move other members to private as appropriate.
-
// Time |Fetch()| was last called, 0 if never.
base::TimeTicks fetch_start_time_;