Recommit 54405 - Fix late binding induced mismatch of Socket and AuthController

net/socket/socket_test_util.cc

 // 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.
 
 #include "net/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 
@@ skipping 169 matching lines @@
       pending_buf_len_(0),
       pending_callback_(NULL) {
   DCHECK(data_);
   data_->Reset();
 }
 
 int MockTCPClientSocket::Connect(net::CompletionCallback* callback) {
   if (connected_)
     return net::OK;
   connected_ = true;
+  peer_closed_connection_ = false;
   if (data_->connect_data().async) {
     RunCallbackAsync(callback, data_->connect_data().result);
     return net::ERR_IO_PENDING;
   }
   return data_->connect_data().result;
 }
 
 void MockTCPClientSocket::Disconnect() {
   MockClientSocket::Disconnect();
   pending_callback_ = NULL;
@@ skipping 679 matching lines @@
   return tcp_pool_->CancelRequest(group_name, handle);
 }
 
 void MockSOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
                                               ClientSocket* socket, int id) {
   return tcp_pool_->ReleaseSocket(group_name, socket, id);
 }
 
 MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {}
 
-MockHttpAuthController::MockHttpAuthController()
-    : HttpAuthController(HttpAuth::AUTH_PROXY, GURL(),
-                         scoped_refptr<HttpNetworkSession>(NULL)),
-      data_(NULL),
-      data_index_(0),
-      data_count_(0) {
-}
-
-void MockHttpAuthController::SetMockAuthControllerData(
-    struct MockHttpAuthControllerData* data, size_t count) {
-  data_ = data;
-  data_count_ = count;
-}
-
-int MockHttpAuthController::MaybeGenerateAuthToken(
-    const HttpRequestInfo* request,
-    CompletionCallback* callback,
-    const BoundNetLog& net_log) {
-  return OK;
-}
-
-void MockHttpAuthController::AddAuthorizationHeader(
-    HttpRequestHeaders* authorization_headers) {
-  authorization_headers->AddHeadersFromString(CurrentData().auth_header);
-}
-
-int MockHttpAuthController::HandleAuthChallenge(
-    scoped_refptr<HttpResponseHeaders> headers,
-    bool do_not_send_server_auth,
-    bool establishing_tunnel,
-    const BoundNetLog& net_log) {
-  return OK;
-}
-
-void MockHttpAuthController::ResetAuth(const string16& username,
-                                       const string16& password) {
-  data_index_++;
-}
-
-bool MockHttpAuthController::HaveAuth() const {
-  return CurrentData().auth_header.size() != 0;
-}
-
-bool MockHttpAuthController::HaveAuthHandler() const {
-  return HaveAuth();
-}
-
 const char kSOCKS5GreetRequest[] = { 0x05, 0x01, 0x00 };
 const int kSOCKS5GreetRequestLength = arraysize(kSOCKS5GreetRequest);
 
 const char kSOCKS5GreetResponse[] = { 0x05, 0x00 };
 const int kSOCKS5GreetResponseLength = arraysize(kSOCKS5GreetResponse);
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net