Net: Add NET_API to socket_stream and spdy.

BUG=76997
TEST=NONE
Review URL: http://codereview.chromium.org/7044021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86011 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 26 insertions, 20 deletions

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() {}