summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 15:52:26 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 15:52:26 +0000
commit172da1b80ab1d9ec5428f04919f1bed13a37e3dc (patch)
tree4ee0eaf3d734a20b208de30616123ad7621abf5a /net/socket_stream
parent8b615de52644092891367b304f3b4663cc6daba6 (diff)
downloadchromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.zip
chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.gz
chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.bz2
Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.
Review URL: http://codereview.chromium.org/7529043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.h7
-rw-r--r--net/socket_stream/socket_stream_job.h4
-rw-r--r--net/socket_stream/socket_stream_metrics.h4
3 files changed, 8 insertions, 7 deletions
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 5e5b339..9ce0074 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -18,7 +18,7 @@
#include "net/base/address_list.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
#include "net/base/net_log.h"
#include "net/base/net_errors.h"
#include "net/base/ssl_config_service.h"
@@ -46,7 +46,8 @@ class SocketStreamMetrics;
// authentication identity for proxy URL first. If server requires proxy
// authentication, it will try authentication identity for realm that server
// requests.
-class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
+class NET_EXPORT SocketStream
+ : public base::RefCountedThreadSafe<SocketStream> {
public:
// Derive from this class and add your own data members to associate extra
// information with a SocketStream. Use GetUserData(key) and
@@ -57,7 +58,7 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
virtual ~UserData() {}
};
- class NET_API Delegate {
+ class NET_EXPORT Delegate {
public:
virtual ~Delegate() {}
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index 7f8175d..0b87c1a 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
#include "net/socket_stream/socket_stream.h"
class GURL;
@@ -26,7 +26,7 @@ class TransportSecurityState;
// WebSocketJob) to do some work on data over SocketStream.
// Registers the protocol specific SocketStreamJob by RegisterProtocolFactory
// and call CreateSocketStreamJob to create SocketStreamJob for the URL.
-class NET_API SocketStreamJob
+class NET_EXPORT SocketStreamJob
: public base::RefCountedThreadSafe<SocketStreamJob> {
public:
// Callback function implemented by protocol handlers to create new jobs.
diff --git a/net/socket_stream/socket_stream_metrics.h b/net/socket_stream/socket_stream_metrics.h
index e69ba25..252a9ea 100644
--- a/net/socket_stream/socket_stream_metrics.h
+++ b/net/socket_stream/socket_stream_metrics.h
@@ -11,13 +11,13 @@
#include "base/basictypes.h"
#include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
class GURL;
namespace net {
-class NET_TEST SocketStreamMetrics {
+class NET_EXPORT_PRIVATE SocketStreamMetrics {
public:
enum ProtocolType {
PROTOCOL_UNKNOWN,