summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 22:30:34 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 22:30:34 +0000
commitcb49bd72709056f700cc25d3004d44c25b0392c1 (patch)
tree3b2694c920ff535e63f98e5ff4fce7bbc1bb4896 /jingle
parent28b06dc0b1145fddb4008aec9f9e7a69f86b8a78 (diff)
downloadchromium_src-cb49bd72709056f700cc25d3004d44c25b0392c1.zip
chromium_src-cb49bd72709056f700cc25d3004d44c25b0392c1.tar.gz
chromium_src-cb49bd72709056f700cc25d3004d44c25b0392c1.tar.bz2
Replace the CapturingNetLog in Jingle tests with a NULL
NetLog. It wasn't being queried for anything, so no reason to be using it. This is in preparation for moving CapturingNetLog from the net project to the net_unittests project, as it shouldn't be used in production code. R=eroman@chromium.org,akalin@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/10448033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/base/fake_ssl_client_socket_unittest.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
index 6584ee0..96472df 100644
--- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
+++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
@@ -11,7 +11,6 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "net/base/capturing_net_log.h"
#include "net/base/io_buffer.h"
#include "net/base/net_log.h"
#include "net/base/test_completion_callback.h"
@@ -87,14 +86,13 @@ void AddChunkedOps(base::StringPiece data, size_t chunk_size, net::IoMode mode,
class FakeSSLClientSocketTest : public testing::Test {
protected:
- FakeSSLClientSocketTest()
- : capturing_net_log_(net::CapturingNetLog::kUnbounded) {}
+ FakeSSLClientSocketTest() {}
virtual ~FakeSSLClientSocketTest() {}
net::StreamSocket* MakeClientSocket() {
return mock_client_socket_factory_.CreateTransportClientSocket(
- net::AddressList(), &capturing_net_log_, net::NetLog::Source());
+ net::AddressList(), NULL, net::NetLog::Source());
}
void SetData(const net::MockConnect& mock_connect,
@@ -264,7 +262,6 @@ class FakeSSLClientSocketTest : public testing::Test {
// MockTCPClientSocket needs a message loop.
MessageLoop message_loop_;
- net::CapturingNetLog capturing_net_log_;
net::MockClientSocketFactory mock_client_socket_factory_;
scoped_ptr<net::StaticSocketDataProvider> static_socket_data_provider_;
};