Make HttpAuthController not reference counted.

net/http/http_auth_controller.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_HTTP_HTTP_AUTH_CONTROLLER_H_
 #define NET_HTTP_HTTP_AUTH_CONTROLLER_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_log.h"
 #include "net/http/http_auth.h"
 
 namespace net {
 
 class AuthChallengeInfo;
 class HostResolver;
 class HttpAuthHandler;
 class HttpNetworkSession;
 class HttpRequestHeaders;
 struct HttpRequestInfo;
 
-class HttpAuthController : public base::RefCounted<HttpAuthController> {
+class HttpAuthController {
  public:
   // The arguments are self explanatory except possibly for |auth_url|, which
   // should be both the auth target and auth path in a single url argument.
   HttpAuthController(HttpAuth::Target target, const GURL& auth_url,
                      scoped_refptr<HttpNetworkSession> session);
 
+  ~HttpAuthController();
+
   // Generate an authentication token for |target| if necessary. The return
   // value is a net error code. |OK| will be returned both in the case that
   // a token is correctly generated synchronously, as well as when no tokens
   // were necessary.
   virtual int MaybeGenerateAuthToken(const HttpRequestInfo* request,
                                      CompletionCallback* callback,
                                      const BoundNetLog& net_log);
 
   // Adds either the proxy auth header, or the origin server auth header,
   // as specified by |target_|.
   virtual void AddAuthorizationHeader(
       HttpRequestHeaders* authorization_headers);
 
   // Checks for and handles HTTP status code 401 or 407.
   // |HandleAuthChallenge()| returns OK on success, or a network error code
   // otherwise. It may also populate |auth_info_|.
   virtual int HandleAuthChallenge(scoped_refptr<HttpResponseHeaders> headers,
                                   bool do_not_send_server_auth,
                                   bool establishing_tunnel,
                                   const BoundNetLog& net_log);
 
-  // Store the supplied credentials and prepare to restart the auth.
-  virtual void ResetAuth(const std::wstring& username,
-                         const std::wstring& password);
+  // Store the supplied credentials.
+  virtual void SetCredentials(const std::wstring& username,
+                              const std::wstring& password);
+
+  // Prepare to restart the auth.
+  virtual void PrepareForAuthRestart();
 
   virtual bool HaveAuthHandler() const {
     return handler_.get() != NULL;
   }
 
   virtual bool HaveAuth() const {
     return handler_.get() && !identity_.invalid;
   }
 
+  virtual HttpAuth::Identity AuthIdentity() {
+    return identity_;
+  }
+
   virtual scoped_refptr<AuthChallengeInfo> auth_info() {
     return auth_info_;
   }
 
   virtual bool IsAuthSchemeDisabled(const std::string& scheme) const;
   virtual void DisableAuthScheme(const std::string& scheme);
 
- protected:  // So that we can mock this object.
-  friend class base::RefCounted<HttpAuthController>;
-  virtual ~HttpAuthController();
-
  private:
   // Searches the auth cache for an entry that encompasses the request's path.
   // If such an entry is found, updates |identity_| and |handler_| with the
   // cache entry's data and returns true.
   bool SelectPreemptiveAuth(const BoundNetLog& net_log);
 
   // Invalidates any auth cache entries after authentication has failed.
   // The identity that was rejected is |identity_|.
   void InvalidateRejectedAuthFromCache();
 
@@ skipping 46 matching lines @@
   // True if default credentials have already been tried for this transaction
   // in response to an HTTP authentication challenge.
   bool default_credentials_used_;
 
   scoped_refptr<HttpNetworkSession> session_;
 
   std::set<std::string> disabled_schemes_;
 
   CompletionCallbackImpl<HttpAuthController> io_callback_;
   CompletionCallback* user_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(HttpAuthController);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_CONTROLLER_H_