| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/socket/client_socket_pool_base.h" | 5 #include "net/socket/client_socket_pool_base.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/location.h" | 14 #include "base/location.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
| 18 #include "base/memory/scoped_vector.h" | 18 #include "base/memory/scoped_vector.h" |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 } | 525 } |
| 526 | 526 |
| 527 void CancelRequest(const std::string& group_name, | 527 void CancelRequest(const std::string& group_name, |
| 528 ClientSocketHandle* handle) override { | 528 ClientSocketHandle* handle) override { |
| 529 base_.CancelRequest(group_name, handle); | 529 base_.CancelRequest(group_name, handle); |
| 530 } | 530 } |
| 531 | 531 |
| 532 void ReleaseSocket(const std::string& group_name, | 532 void ReleaseSocket(const std::string& group_name, |
| 533 scoped_ptr<StreamSocket> socket, | 533 scoped_ptr<StreamSocket> socket, |
| 534 int id) override { | 534 int id) override { |
| 535 base_.ReleaseSocket(group_name, socket.Pass(), id); | 535 base_.ReleaseSocket(group_name, std::move(socket), id); |
| 536 } | 536 } |
| 537 | 537 |
| 538 void FlushWithError(int error) override { base_.FlushWithError(error); } | 538 void FlushWithError(int error) override { base_.FlushWithError(error); } |
| 539 | 539 |
| 540 bool IsStalled() const override { return base_.IsStalled(); } | 540 bool IsStalled() const override { return base_.IsStalled(); } |
| 541 | 541 |
| 542 void CloseIdleSockets() override { base_.CloseIdleSockets(); } | 542 void CloseIdleSockets() override { base_.CloseIdleSockets(); } |
| 543 | 543 |
| 544 int IdleSocketCount() const override { return base_.idle_socket_count(); } | 544 int IdleSocketCount() const override { return base_.idle_socket_count(); } |
| 545 | 545 |
| (...skipping 3541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4087 request(1)->handle()->Reset(); | 4087 request(1)->handle()->Reset(); |
| 4088 ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); | 4088 ASSERT_EQ(1, pool_->NumConnectJobsInGroup("a")); |
| 4089 | 4089 |
| 4090 EXPECT_EQ(OK, request(2)->WaitForResult()); | 4090 EXPECT_EQ(OK, request(2)->WaitForResult()); |
| 4091 EXPECT_FALSE(request(1)->have_result()); | 4091 EXPECT_FALSE(request(1)->have_result()); |
| 4092 } | 4092 } |
| 4093 | 4093 |
| 4094 } // namespace | 4094 } // namespace |
| 4095 | 4095 |
| 4096 } // namespace net | 4096 } // namespace net |
| OLD | NEW |