diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 19:47:30 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 19:47:30 +0000 |
| commit | 68bf915b57f9e781622c433f8795153cca8b5b9e (patch) | |
| tree | 9951f7fa93ba72213f2057e82b13f84248f904b6 /net/http/http_network_transaction_unittest.cc | |
| parent | ec9a68914f38540671f2d1ea1b3d8e10e29e50c6 (diff) | |
| download | chromium_src-68bf915b57f9e781622c433f8795153cca8b5b9e.zip chromium_src-68bf915b57f9e781622c433f8795153cca8b5b9e.tar.gz chromium_src-68bf915b57f9e781622c433f8795153cca8b5b9e.tar.bz2 | |
add http layer and unit tests to mac build. stub out file uploading in upload_data_stream until we have a common file wrapper.
Review URL: http://codereview.chromium.org/4090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 2b54e09..a39399f 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/compiler_specific.h" +#include "base/platform_test.h" #include "net/base/client_socket_factory.h" #include "net/base/test_completion_callback.h" #include "net/base/upload_data.h" @@ -12,7 +14,6 @@ //----------------------------------------------------------------------------- -namespace { struct MockConnect { bool async; @@ -45,9 +46,8 @@ int mock_sockets_index; class MockTCPClientSocket : public net::ClientSocket { public: MockTCPClientSocket(const net::AddressList& addresses) -#pragma warning(suppress:4355) : data_(mock_sockets[mock_sockets_index++]), - method_factory_(this), + ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), callback_(NULL), read_index_(0), read_offset_(0), @@ -218,8 +218,6 @@ SimpleGetHelperResult SimpleGetHelper(MockRead data_reads[]) { return out; } -} // namespace - //----------------------------------------------------------------------------- TEST_F(HttpNetworkTransactionTest, Basic) { |