Index: net/base/mock_host_resolver.h |
diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h |
index 2972c84723317c87cc173e298551b838f2b7b79c..3b1e36afff1ad0df20804635df0e07b085ffffc2 100644 |
--- a/net/base/mock_host_resolver.h |
+++ b/net/base/mock_host_resolver.h |
@@ -41,16 +41,6 @@ class MockHostResolverBase : public HostResolver { |
public: |
virtual ~MockHostResolverBase(); |
- // HostResolver methods: |
- virtual int Resolve(const RequestInfo& info, |
- AddressList* addresses, |
- CompletionCallback* callback, |
- RequestHandle* out_req, |
- const BoundNetLog& net_log); |
- virtual void CancelRequest(RequestHandle req); |
- virtual void AddObserver(Observer* observer); |
- virtual void RemoveObserver(Observer* observer); |
- |
RuleBasedHostResolverProc* rules() { return rules_; } |
// Controls whether resolutions complete synchronously or asynchronously. |
@@ -68,6 +58,16 @@ class MockHostResolverBase : public HostResolver { |
pool_index, max_outstanding_jobs, max_pending_requests); |
} |
+ // HostResolver methods: |
+ virtual int Resolve(const RequestInfo& info, |
+ AddressList* addresses, |
+ CompletionCallback* callback, |
+ RequestHandle* out_req, |
+ const BoundNetLog& net_log); |
+ virtual void CancelRequest(RequestHandle req); |
+ virtual void AddObserver(Observer* observer); |
+ virtual void RemoveObserver(Observer* observer); |
+ |
protected: |
MockHostResolverBase(bool use_caching); |
@@ -143,11 +143,11 @@ class RuleBasedHostResolverProc : public HostResolverProc { |
int* os_error); |
private: |
- ~RuleBasedHostResolverProc(); |
- |
struct Rule; |
typedef std::list<Rule> RuleList; |
+ ~RuleBasedHostResolverProc(); |
+ |
RuleList rules_; |
}; |