summaryrefslogtreecommitdiffstats
path: root/net/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'net/ftp')
-rw-r--r--net/ftp/ftp_auth_cache.h4
-rw-r--r--net/ftp/ftp_ctrl_response_buffer.h6
-rw-r--r--net/ftp/ftp_directory_listing_parser.h4
-rw-r--r--net/ftp/ftp_directory_listing_parser_ls.h4
-rw-r--r--net/ftp/ftp_directory_listing_parser_netware.h4
-rw-r--r--net/ftp/ftp_directory_listing_parser_os2.h4
-rw-r--r--net/ftp/ftp_directory_listing_parser_vms.h4
-rw-r--r--net/ftp/ftp_directory_listing_parser_windows.h4
-rw-r--r--net/ftp/ftp_network_layer.h4
-rw-r--r--net/ftp/ftp_network_session.h5
-rw-r--r--net/ftp/ftp_network_transaction.h2
-rw-r--r--net/ftp/ftp_transaction.h4
-rw-r--r--net/ftp/ftp_transaction_factory.h4
-rw-r--r--net/ftp/ftp_util.h4
14 files changed, 29 insertions, 28 deletions
diff --git a/net/ftp/ftp_auth_cache.h b/net/ftp/ftp_auth_cache.h
index 1ed83f0..6281f9d 100644
--- a/net/ftp/ftp_auth_cache.h
+++ b/net/ftp/ftp_auth_cache.h
@@ -10,7 +10,7 @@
#include "base/string16.h"
#include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
@@ -22,7 +22,7 @@ namespace net {
// GURL("ftp://myserver") -- OK (implied port of 21)
// GURL("ftp://myserver:21") -- OK
// GURL("ftp://myserver/PATH") -- WRONG, paths not allowed
-class NET_TEST FtpAuthCache {
+class NET_EXPORT_PRIVATE FtpAuthCache {
public:
// Maximum number of entries we allow in the cache.
static const size_t kMaxEntries;
diff --git a/net/ftp/ftp_ctrl_response_buffer.h b/net/ftp/ftp_ctrl_response_buffer.h
index 031a666..c2224bb 100644
--- a/net/ftp/ftp_ctrl_response_buffer.h
+++ b/net/ftp/ftp_ctrl_response_buffer.h
@@ -12,11 +12,11 @@
#include <vector>
#include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
-struct NET_TEST FtpCtrlResponse {
+struct NET_EXPORT_PRIVATE FtpCtrlResponse {
static const int kInvalidStatusCode;
FtpCtrlResponse();
@@ -26,7 +26,7 @@ struct NET_TEST FtpCtrlResponse {
std::vector<std::string> lines; // Response lines, without CRLFs.
};
-class NET_TEST FtpCtrlResponseBuffer {
+class NET_EXPORT_PRIVATE FtpCtrlResponseBuffer {
public:
FtpCtrlResponseBuffer();
~FtpCtrlResponseBuffer();
diff --git a/net/ftp/ftp_directory_listing_parser.h b/net/ftp/ftp_directory_listing_parser.h
index c0292ea..7e43dc8 100644
--- a/net/ftp/ftp_directory_listing_parser.h
+++ b/net/ftp/ftp_directory_listing_parser.h
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
@@ -37,7 +37,7 @@ struct FtpDirectoryListingEntry {
// Parses an FTP directory listing |text|. On success fills in |entries|.
// Returns network error code.
-NET_API int ParseFtpDirectoryListing(
+NET_EXPORT int ParseFtpDirectoryListing(
const std::string& text,
const base::Time& current_time,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_ls.h b/net/ftp/ftp_directory_listing_parser_ls.h
index 5eeeeae..a690d63 100644
--- a/net/ftp/ftp_directory_listing_parser_ls.h
+++ b/net/ftp/ftp_directory_listing_parser_ls.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace base {
class Time;
@@ -20,7 +20,7 @@ namespace net {
struct FtpDirectoryListingEntry;
// Parses "ls -l" FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingLs(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingLs(
const std::vector<string16>& lines,
const base::Time& current_time,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_netware.h b/net/ftp/ftp_directory_listing_parser_netware.h
index 6e504e7..b6c8078 100644
--- a/net/ftp/ftp_directory_listing_parser_netware.h
+++ b/net/ftp/ftp_directory_listing_parser_netware.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace base {
class Time;
@@ -20,7 +20,7 @@ namespace net {
struct FtpDirectoryListingEntry;
// Parses Netware FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingNetware(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingNetware(
const std::vector<string16>& lines,
const base::Time& current_time,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_os2.h b/net/ftp/ftp_directory_listing_parser_os2.h
index 356b5b7..808343e 100644
--- a/net/ftp/ftp_directory_listing_parser_os2.h
+++ b/net/ftp/ftp_directory_listing_parser_os2.h
@@ -9,14 +9,14 @@
#include <vector>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
struct FtpDirectoryListingEntry;
// Parses OS/2 FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingOS2(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingOS2(
const std::vector<string16>& lines,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_vms.h b/net/ftp/ftp_directory_listing_parser_vms.h
index 59bcc12..64df7df 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.h
+++ b/net/ftp/ftp_directory_listing_parser_vms.h
@@ -9,14 +9,14 @@
#include <vector>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
struct FtpDirectoryListingEntry;
// Parses VMS FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingVms(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingVms(
const std::vector<string16>& lines,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_windows.h b/net/ftp/ftp_directory_listing_parser_windows.h
index a77e5da..81cec7f 100644
--- a/net/ftp/ftp_directory_listing_parser_windows.h
+++ b/net/ftp/ftp_directory_listing_parser_windows.h
@@ -9,14 +9,14 @@
#include <vector>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
struct FtpDirectoryListingEntry;
// Parses Windows FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingWindows(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingWindows(
const std::vector<string16>& lines,
std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_network_layer.h b/net/ftp/ftp_network_layer.h
index 2bc8511..d4bfe46 100644
--- a/net/ftp/ftp_network_layer.h
+++ b/net/ftp/ftp_network_layer.h
@@ -8,7 +8,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
#include "net/ftp/ftp_transaction_factory.h"
namespace net {
@@ -16,7 +16,7 @@ namespace net {
class FtpNetworkSession;
class HostResolver;
-class NET_API FtpNetworkLayer : public FtpTransactionFactory {
+class NET_EXPORT FtpNetworkLayer : public FtpTransactionFactory {
public:
explicit FtpNetworkLayer(HostResolver* host_resolver);
virtual ~FtpNetworkLayer();
diff --git a/net/ftp/ftp_network_session.h b/net/ftp/ftp_network_session.h
index b39151c..ad1178a 100644
--- a/net/ftp/ftp_network_session.h
+++ b/net/ftp/ftp_network_session.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
#include "net/ftp/ftp_auth_cache.h"
namespace net {
@@ -15,7 +15,8 @@ namespace net {
class HostResolver;
// This class holds session objects used by FtpNetworkTransaction objects.
-class NET_TEST FtpNetworkSession : public base::RefCounted<FtpNetworkSession> {
+class NET_EXPORT_PRIVATE FtpNetworkSession
+ : public base::RefCounted<FtpNetworkSession> {
public:
explicit FtpNetworkSession(HostResolver* host_resolver);
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h
index 459d5b1..c47c65f 100644
--- a/net/ftp/ftp_network_transaction.h
+++ b/net/ftp/ftp_network_transaction.h
@@ -27,7 +27,7 @@ class ClientSocketFactory;
class FtpNetworkSession;
class StreamSocket;
-class NET_TEST FtpNetworkTransaction : public FtpTransaction {
+class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {
public:
FtpNetworkTransaction(FtpNetworkSession* session,
ClientSocketFactory* socket_factory);
diff --git a/net/ftp/ftp_transaction.h b/net/ftp/ftp_transaction.h
index a3a6a12..2d1c5d8 100644
--- a/net/ftp/ftp_transaction.h
+++ b/net/ftp/ftp_transaction.h
@@ -10,7 +10,7 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/load_states.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
@@ -19,7 +19,7 @@ class FtpRequestInfo;
class BoundNetLog;
// Represents a single FTP transaction.
-class NET_TEST FtpTransaction {
+class NET_EXPORT_PRIVATE FtpTransaction {
public:
// Stops any pending IO and destroys the transaction object.
virtual ~FtpTransaction() {}
diff --git a/net/ftp/ftp_transaction_factory.h b/net/ftp/ftp_transaction_factory.h
index 30ec14d..9e53c70 100644
--- a/net/ftp/ftp_transaction_factory.h
+++ b/net/ftp/ftp_transaction_factory.h
@@ -6,14 +6,14 @@
#define NET_FTP_FTP_TRANSACTION_FACTORY_H_
#pragma once
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace net {
class FtpTransaction;
// An interface to a class that can create FtpTransaction objects.
-class NET_API FtpTransactionFactory {
+class NET_EXPORT FtpTransactionFactory {
public:
virtual ~FtpTransactionFactory() {}
diff --git a/net/ftp/ftp_util.h b/net/ftp/ftp_util.h
index d4fa499..d0250f0 100644
--- a/net/ftp/ftp_util.h
+++ b/net/ftp/ftp_util.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
namespace base {
class Time;
@@ -17,7 +17,7 @@ class Time;
namespace net {
-class NET_TEST FtpUtil {
+class NET_EXPORT_PRIVATE FtpUtil {
public:
// Converts Unix file path to VMS path (must be a file, and not a directory).
static std::string UnixFilePathToVMS(const std::string& unix_path);
generated by cgit v1.1 at 2025-02-07 09:01:11 +0000