summaryrefslogtreecommitdiff
path: root/chromium/net/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/ftp')
-rw-r--r--chromium/net/ftp/ftp_ctrl_response_buffer.h6
-rw-r--r--chromium/net/ftp/ftp_network_layer.cc1
-rw-r--r--chromium/net/ftp/ftp_network_transaction_unittest.cc6
3 files changed, 5 insertions, 8 deletions
diff --git a/chromium/net/ftp/ftp_ctrl_response_buffer.h b/chromium/net/ftp/ftp_ctrl_response_buffer.h
index e8683ec88ab..d179b4da460 100644
--- a/chromium/net/ftp/ftp_ctrl_response_buffer.h
+++ b/chromium/net/ftp/ftp_ctrl_response_buffer.h
@@ -5,10 +5,10 @@
#ifndef NET_FTP_FTP_CTRL_RESPONSE_BUFFER_H_
#define NET_FTP_FTP_CTRL_RESPONSE_BUFFER_H_
-#include <queue>
#include <string>
#include <vector>
+#include "base/containers/queue.h"
#include "base/macros.h"
#include "net/base/net_export.h"
#include "net/log/net_log_with_source.h"
@@ -76,7 +76,7 @@ class NET_EXPORT_PRIVATE FtpCtrlResponseBuffer {
// We keep not-yet-parsed data in a string buffer.
std::string buffer_;
- std::queue<ParsedLine> lines_;
+ base::queue<ParsedLine> lines_;
// True if we are in the middle of parsing a multi-line response.
bool multiline_;
@@ -90,7 +90,7 @@ class NET_EXPORT_PRIVATE FtpCtrlResponseBuffer {
FtpCtrlResponse response_buf_;
// As we read full responses (possibly multiline), we add them to the queue.
- std::queue<FtpCtrlResponse> responses_;
+ base::queue<FtpCtrlResponse> responses_;
NetLogWithSource net_log_;
diff --git a/chromium/net/ftp/ftp_network_layer.cc b/chromium/net/ftp/ftp_network_layer.cc
index d2c4a5d6f95..678072327e5 100644
--- a/chromium/net/ftp/ftp_network_layer.cc
+++ b/chromium/net/ftp/ftp_network_layer.cc
@@ -5,7 +5,6 @@
#include "net/ftp/ftp_network_layer.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "net/ftp/ftp_network_session.h"
#include "net/ftp/ftp_network_transaction.h"
#include "net/socket/client_socket_factory.h"
diff --git a/chromium/net/ftp/ftp_network_transaction_unittest.cc b/chromium/net/ftp/ftp_network_transaction_unittest.cc
index 3b04c6e401f..cfbd2625d69 100644
--- a/chromium/net/ftp/ftp_network_transaction_unittest.cc
+++ b/chromium/net/ftp/ftp_network_transaction_unittest.cc
@@ -4,10 +4,8 @@
#include "net/ftp/ftp_network_transaction.h"
-#include <deque>
-
+#include "base/containers/circular_deque.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -217,7 +215,7 @@ class FtpSocketDataProvider : public SocketDataProvider {
private:
// List of reads to be consumed.
- std::deque<MockRead> reads_;
+ base::circular_deque<MockRead> reads_;
// Max number of bytes we will read at a time. 0 means no limit.
int short_read_limit_;