From 83e875da32de6614774f976b49bc2fd42997f433 Mon Sep 17 00:00:00 2001 From: "ddorwin@chromium.org" Date: Thu, 29 Sep 2011 22:24:18 +0000 Subject: Revert 103360 - NetworkDelegate::OnAuthRequired can set authentication or cancel, in addition to observing. TBR=ananta@chromium.org BUG=32056 TEST=net_unittests Review URL: http://codereview.chromium.org/8037038 TBR=cbentzel@chromium.org Review URL: http://codereview.chromium.org/8082010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103372 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/network_delegate_error_observer_unittest.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'net/proxy') diff --git a/net/proxy/network_delegate_error_observer_unittest.cc b/net/proxy/network_delegate_error_observer_unittest.cc index 5481e0f..551c006 100644 --- a/net/proxy/network_delegate_error_observer_unittest.cc +++ b/net/proxy/network_delegate_error_observer_unittest.cc @@ -28,12 +28,12 @@ class TestNetworkDelegate : public net::NetworkDelegate { virtual int OnBeforeURLRequest(URLRequest* request, CompletionCallback* callback, GURL* new_url) OVERRIDE { - return OK; + return net::OK; } virtual int OnBeforeSendHeaders(URLRequest* request, CompletionCallback* callback, HttpRequestHeaders* headers) OVERRIDE { - return OK; + return net::OK; } virtual void OnSendHeaders(URLRequest* request, const HttpRequestHeaders& headers) OVERRIDE {} @@ -49,13 +49,8 @@ class TestNetworkDelegate : public net::NetworkDelegate { const string16& error) OVERRIDE { got_pac_error_ = true; } - virtual AuthRequiredResponse OnAuthRequired( - URLRequest* request, - const AuthChallengeInfo& auth_info, - const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE { - return AUTH_REQUIRED_RESPONSE_NO_ACTION; - } + virtual void OnAuthRequired(URLRequest* request, + const AuthChallengeInfo& auth_info) OVERRIDE {} bool got_pac_error_; }; -- cgit v1.1