summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/socket_stream/socket_stream.h5
-rw-r--r--net/socket_stream/socket_stream_job.h4
-rw-r--r--net/socket_stream/socket_stream_metrics.h5
-rw-r--r--net/spdy/spdy_frame_builder.h5
-rw-r--r--net/spdy/spdy_framer.h5
-rw-r--r--net/spdy/spdy_http_stream.h2
-rw-r--r--net/spdy/spdy_http_utils.h5
-rw-r--r--net/spdy/spdy_io_buffer.h6
-rw-r--r--net/spdy/spdy_proxy_client_socket.h4
-rw-r--r--net/spdy/spdy_session.h4
-rw-r--r--net/spdy/spdy_session_pool.h3
-rw-r--r--net/spdy/spdy_settings_storage.h5
-rw-r--r--net/spdy/spdy_stream.h7
13 files changed, 35 insertions, 25 deletions
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index b41777f..18042e0 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -18,6 +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_log.h"
#include "net/base/net_errors.h"
#include "net/base/ssl_config_service.h"
@@ -45,7 +46,7 @@ class SocketStreamMetrics;
// authentication identity for proxy URL first. If server requires proxy
// authentication, it will try authentication identity for realm that server
// requests.
-class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
+class NET_API 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
@@ -56,7 +57,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
virtual ~UserData() {}
};
- class Delegate {
+ class NET_API Delegate {
public:
virtual ~Delegate() {}
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index fdf8d4b..7f8175d 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -10,6 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/string16.h"
+#include "net/base/net_api.h"
#include "net/socket_stream/socket_stream.h"
class GURL;
@@ -25,7 +26,8 @@ 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 SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> {
+class NET_API SocketStreamJob
+ : public base::RefCountedThreadSafe<SocketStreamJob> {
public:
// Callback function implemented by protocol handlers to create new jobs.
typedef SocketStreamJob* (ProtocolFactory)(const GURL& url,
diff --git a/net/socket_stream/socket_stream_metrics.h b/net/socket_stream/socket_stream_metrics.h
index 66a9ffd..4bd93be6 100644
--- a/net/socket_stream/socket_stream_metrics.h
+++ b/net/socket_stream/socket_stream_metrics.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
//
@@ -11,12 +11,13 @@
#include "base/basictypes.h"
#include "base/time.h"
+#include "net/base/net_api.h"
class GURL;
namespace net {
-class SocketStreamMetrics {
+class NET_TEST SocketStreamMetrics {
public:
enum ProtocolType {
PROTOCOL_UNKNOWN,
diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h
index df2f16d..fd30a54 100644
--- a/net/spdy/spdy_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -9,6 +9,7 @@
#include <string>
#include "base/basictypes.h"
+#include "net/base/net_api.h"
#include "net/base/sys_byteorder.h"
#include "net/spdy/spdy_protocol.h"
@@ -25,7 +26,7 @@ namespace spdy {
// When reading from a SpdyFrameBuilder the consumer must know what value types
// to read and in what order to read them as the SpdyFrameBuilder does not keep
// track of the type of data written to it.
-class SpdyFrameBuilder {
+class NET_TEST SpdyFrameBuilder {
public:
SpdyFrameBuilder();
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index 332a47f..62b48d4 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -14,6 +14,7 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
+#include "net/base/net_api.h"
#include "net/base/sys_byteorder.h"
#include "net/spdy/spdy_protocol.h"
@@ -51,7 +52,7 @@ typedef std::list<SpdySetting> SpdySettings;
// SpdyFramerVisitorInterface is a set of callbacks for the SpdyFramer.
// Implement this interface to receive event callbacks as frames are
// decoded from the framer.
-class SpdyFramerVisitorInterface {
+class NET_TEST SpdyFramerVisitorInterface {
public:
virtual ~SpdyFramerVisitorInterface() {}
@@ -72,7 +73,7 @@ class SpdyFramerVisitorInterface {
size_t len) = 0;
};
-class SpdyFramer {
+class NET_TEST SpdyFramer {
public:
// SPDY states.
// TODO(mbelshe): Can we move these into the implementation
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index 31f62f6..88c627d 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -29,7 +29,7 @@ class UploadData;
class UploadDataStream;
// The SpdyHttpStream is a HTTP-specific type of stream known to a SpdySession.
-class SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
+class NET_TEST SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
public:
SpdyHttpStream(SpdySession* spdy_session, bool direct);
virtual ~SpdyHttpStream();
diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
index 855d264..eede59f 100644
--- a/net/spdy/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -6,6 +6,7 @@
#define NET_SPDY_SPDY_HTTP_UTILS_H_
#pragma once
+#include "net/base/net_api.h"
#include "net/base/request_priority.h"
#include "net/spdy/spdy_framer.h"
@@ -30,7 +31,7 @@ void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
spdy::SpdyHeaderBlock* headers,
bool direct);
-int ConvertRequestPriorityToSpdyPriority(RequestPriority priority);
+NET_TEST int ConvertRequestPriorityToSpdyPriority(RequestPriority priority);
} // namespace net
diff --git a/net/spdy/spdy_io_buffer.h b/net/spdy/spdy_io_buffer.h
index a541bda..9cb3811 100644
--- a/net/spdy/spdy_io_buffer.h
+++ b/net/spdy/spdy_io_buffer.h
@@ -8,16 +8,16 @@
#include "base/memory/ref_counted.h"
#include "net/base/io_buffer.h"
+#include "net/base/net_api.h"
+#include "net/spdy/spdy_stream.h"
namespace net {
-class SpdyStream;
-
// A class for managing SPDY IO buffers. These buffers need to be prioritized
// so that the SpdySession sends them in the right order. Further, they need
// to track the SpdyStream which they are associated with so that incremental
// completion of the IO can notify the appropriate stream of completion.
-class SpdyIOBuffer {
+class NET_TEST SpdyIOBuffer {
public:
// Constructor
// |buffer| is the actual data buffer.
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index 4dc6e23..d7510d1 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -36,8 +36,8 @@ class IOBuffer;
class SpdySession;
class SpdyStream;
-class SpdyProxyClientSocket : public ProxyClientSocket,
- public SpdyStream::Delegate {
+class NET_TEST SpdyProxyClientSocket : public ProxyClientSocket,
+ public SpdyStream::Delegate {
public:
// Create a socket on top of the |spdy_stream| by sending a SYN_STREAM
// CONNECT frame for |endpoint|. After the SYN_REPLY is received,
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 9cd9038..f26d256 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -44,8 +44,8 @@ class SpdySettingsStorage;
class SpdyStream;
class SSLInfo;
-class SpdySession : public base::RefCounted<SpdySession>,
- public spdy::SpdyFramerVisitorInterface {
+class NET_API SpdySession : public base::RefCounted<SpdySession>,
+ public spdy::SpdyFramerVisitorInterface {
public:
// Create a new SpdySession.
// |host_port_proxy_pair| is the host/port that this session connects to, and
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 32531d5..0fd1a17 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -17,6 +17,7 @@
#include "net/base/cert_database.h"
#include "net/base/host_port_pair.h"
#include "net/base/ip_endpoint.h"
+#include "net/base/net_api.h"
#include "net/base/net_errors.h"
#include "net/base/network_change_notifier.h"
#include "net/base/ssl_config_service.h"
@@ -34,7 +35,7 @@ class HttpNetworkSession;
class SpdySession;
// This is a very simple pool for open SpdySessions.
-class SpdySessionPool
+class NET_API SpdySessionPool
: public NetworkChangeNotifier::IPAddressObserver,
public SSLConfigService::Observer,
public CertDatabase::Observer {
diff --git a/net/spdy/spdy_settings_storage.h b/net/spdy/spdy_settings_storage.h
index 999f016..1ea492d 100644
--- a/net/spdy/spdy_settings_storage.h
+++ b/net/spdy/spdy_settings_storage.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -9,13 +9,14 @@
#include <map>
#include "base/basictypes.h"
#include "net/base/host_port_pair.h"
+#include "net/base/net_api.h"
#include "net/spdy/spdy_framer.h"
namespace net {
// SpdySettingsStorage stores SpdySettings which have been transmitted between
// endpoints for the SPDY SETTINGS frame.
-class SpdySettingsStorage {
+class NET_TEST SpdySettingsStorage {
public:
SpdySettingsStorage();
~SpdySettingsStorage();
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index a2fefd9..f8b115e 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -16,8 +16,9 @@
#include "googleurl/src/gurl.h"
#include "net/base/bandwidth_metrics.h"
#include "net/base/io_buffer.h"
-#include "net/base/upload_data.h"
+#include "net/base/net_api.h"
#include "net/base/net_log.h"
+#include "net/base/upload_data.h"
#include "net/spdy/spdy_framer.h"
#include "net/spdy/spdy_protocol.h"
@@ -36,12 +37,12 @@ class SSLInfo;
// a SpdyNetworkTransaction) will maintain a reference to the stream. When
// initiated by the server, only the SpdySession will maintain any reference,
// until such a time as a client object requests a stream for the path.
-class SpdyStream
+class NET_TEST SpdyStream
: public base::RefCounted<SpdyStream>,
public ChunkCallback {
public:
// Delegate handles protocol specific behavior of spdy stream.
- class Delegate {
+ class NET_TEST Delegate {
public:
Delegate() {}
generated by cgit v1.1 at 2025-03-12 16:51:57 +0000