Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(434)

Unified Diff: net/websockets/websocket_basic_stream_test.cc

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_basic_stream_test.cc
diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc
index aca04b01cf8a6677b02696c8fcebba818992c254..69aab3c767d6b2b36f840f5ac56626e5d04167d8 100644
--- a/net/websockets/websocket_basic_stream_test.cc
+++ b/net/websockets/websocket_basic_stream_test.cc
@@ -16,7 +16,7 @@
#include "base/big_endian.h"
#include "base/port.h"
#include "net/base/test_completion_callback.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
#include "net/socket/socket_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -75,7 +75,7 @@ WebSocketMaskingKey GenerateNonNulMaskingKey() { return kNonNulMaskingKey; }
class WebSocketBasicStreamTest : public ::testing::Test {
protected:
scoped_ptr<WebSocketBasicStream> stream_;
- CapturingNetLog net_log_;
+ TestNetLog net_log_;
};
// A subclass of StaticSocketDataProvider modified to require that all data
@@ -164,7 +164,7 @@ class WebSocketBasicStreamSocketTest : public WebSocketBasicStreamTest {
scoped_ptr<SocketDataProvider> socket_data_;
MockClientSocketFactory factory_;
MockTransportClientSocketPool pool_;
- CapturingBoundNetLog(bound_net_log_);
+ BoundTestNetLog(bound_net_log_);
ScopedVector<WebSocketFrame> frames_;
TestCompletionCallback cb_;
scoped_refptr<GrowableIOBuffer> http_read_buffer_;
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698