| Index: net/http/http_auth_handler_mock.h
|
| diff --git a/net/http/http_auth_handler_mock.h b/net/http/http_auth_handler_mock.h
|
| index bef8b2b806c51e193ff43890ced7cd9465ad9fd3..473ca2e19f4c8e65d372cd8b8d2c9d64c9f760b1 100644
|
| --- a/net/http/http_auth_handler_mock.h
|
| +++ b/net/http/http_auth_handler_mock.h
|
| @@ -29,32 +29,6 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
|
| RESOLVE_TESTED,
|
| };
|
|
|
| - HttpAuthHandlerMock();
|
| -
|
| - virtual ~HttpAuthHandlerMock();
|
| -
|
| - void SetResolveExpectation(Resolve resolve);
|
| -
|
| - virtual bool NeedsCanonicalName();
|
| -
|
| - virtual int ResolveCanonicalName(HostResolver* host_resolver,
|
| - CompletionCallback* callback);
|
| -
|
| - virtual bool NeedsIdentity() { return first_round_; }
|
| -
|
| - void SetGenerateExpectation(bool async, int rv);
|
| -
|
| - void set_connection_based(bool connection_based) {
|
| - connection_based_ = connection_based;
|
| - }
|
| -
|
| - const GURL& request_url() const {
|
| - return request_url_;
|
| - }
|
| -
|
| - HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
| - HttpAuth::ChallengeTokenizer* challenge);
|
| -
|
| // The Factory class simply returns the same handler each time
|
| // CreateAuthHandler is called.
|
| class Factory : public HttpAuthHandlerFactory {
|
| @@ -68,6 +42,7 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
|
| do_init_from_challenge_ = do_init_from_challenge;
|
| }
|
|
|
| + // HttpAuthHandlerFactory:
|
| virtual int CreateAuthHandler(HttpAuth::ChallengeTokenizer* challenge,
|
| HttpAuth::Target target,
|
| const GURL& origin,
|
| @@ -81,6 +56,33 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
|
| bool do_init_from_challenge_;
|
| };
|
|
|
| + HttpAuthHandlerMock();
|
| +
|
| + virtual ~HttpAuthHandlerMock();
|
| +
|
| + void SetResolveExpectation(Resolve resolve);
|
| +
|
| + virtual bool NeedsCanonicalName();
|
| +
|
| + virtual int ResolveCanonicalName(HostResolver* host_resolver,
|
| + CompletionCallback* callback);
|
| +
|
| +
|
| + void SetGenerateExpectation(bool async, int rv);
|
| +
|
| + void set_connection_based(bool connection_based) {
|
| + connection_based_ = connection_based;
|
| + }
|
| +
|
| + const GURL& request_url() const {
|
| + return request_url_;
|
| + }
|
| +
|
| + // HttpAuthHandler:
|
| + virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
| + HttpAuth::ChallengeTokenizer* challenge);
|
| + virtual bool NeedsIdentity();
|
| +
|
| protected:
|
| virtual bool Init(HttpAuth::ChallengeTokenizer* challenge);
|
|
|
|
|