Change HttpAuthHandlerMock to accept and return more than one

net/http/http_auth_handler_mock.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_HANDLER_MOCK_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_
 #pragma once
 
 #include <string>
 
+#include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 
 namespace net {
 
 class HostResolver;
 
 // MockAuthHandler is used in tests to reliably trigger edge cases.
 class HttpAuthHandlerMock : public HttpAuthHandler {
  public:
   enum Resolve {
     RESOLVE_INIT,
     RESOLVE_SKIP,
     RESOLVE_SYNC,
     RESOLVE_ASYNC,
     RESOLVE_TESTED,
   };
 
   // The Factory class simply returns the same handler each time
   // CreateAuthHandler is called.

[cbentzel, 2011/08/03 21:27:38]

Can you change this comment?

[Ryan Hamilton, 2011/08/03 22:03:37]

Done.

   class Factory : public HttpAuthHandlerFactory {
    public:
     Factory();
     virtual ~Factory();
 
-    void set_mock_handler(HttpAuthHandler* handler, HttpAuth::Target target);
+    void AddMockHandler(HttpAuthHandler* handler, HttpAuth::Target target);
 
     void set_do_init_from_challenge(bool do_init_from_challenge) {
       do_init_from_challenge_ = do_init_from_challenge;
     }
 
     // HttpAuthHandlerFactory:
     virtual int CreateAuthHandler(HttpAuth::ChallengeTokenizer* challenge,
                                   HttpAuth::Target target,
                                   const GURL& origin,
                                   CreateReason reason,
                                   int nonce_count,
                                   const BoundNetLog& net_log,
                                   scoped_ptr<HttpAuthHandler>* handler);
 
    private:
-    scoped_ptr<HttpAuthHandler> handlers_[HttpAuth::AUTH_NUM_TARGETS];
+    ScopedVector<HttpAuthHandler> handlers_[HttpAuth::AUTH_NUM_TARGETS];
     bool do_init_from_challenge_;
   };
 
   HttpAuthHandlerMock();
 
   virtual ~HttpAuthHandlerMock();
 
   void SetResolveExpectation(Resolve resolve);
 
   virtual bool NeedsCanonicalName();
@@ skipping 38 matching lines @@
   int generate_rv_;
   std::string* auth_token_;
   bool first_round_;
   bool connection_based_;
   GURL request_url_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_