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

Side by Side Diff: net/spdy/spdy_http_stream_unittest.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/spdy/spdy_http_stream.h" 5 #include "net/spdy/spdy_http_stream.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "crypto/ec_private_key.h" 13 #include "crypto/ec_private_key.h"
14 #include "crypto/ec_signature_creator.h" 14 #include "crypto/ec_signature_creator.h"
15 #include "crypto/signature_creator.h" 15 #include "crypto/signature_creator.h"
16 #include "net/base/chunked_upload_data_stream.h" 16 #include "net/base/chunked_upload_data_stream.h"
17 #include "net/base/load_timing_info.h" 17 #include "net/base/load_timing_info.h"
18 #include "net/base/load_timing_info_test_util.h" 18 #include "net/base/load_timing_info_test_util.h"
19 #include "net/base/test_completion_callback.h" 19 #include "net/base/test_completion_callback.h"
20 #include "net/cert/asn1_util.h" 20 #include "net/cert/asn1_util.h"
21 #include "net/http/http_request_info.h" 21 #include "net/http/http_request_info.h"
22 #include "net/http/http_response_headers.h" 22 #include "net/http/http_response_headers.h"
23 #include "net/http/http_response_info.h" 23 #include "net/http/http_response_info.h"
24 #include "net/log/capturing_net_log.h" 24 #include "net/log/test_net_log.h"
25 #include "net/socket/next_proto.h" 25 #include "net/socket/next_proto.h"
26 #include "net/socket/socket_test_util.h" 26 #include "net/socket/socket_test_util.h"
27 #include "net/spdy/spdy_http_utils.h" 27 #include "net/spdy/spdy_http_utils.h"
28 #include "net/spdy/spdy_session.h" 28 #include "net/spdy/spdy_session.h"
29 #include "net/spdy/spdy_test_util_common.h" 29 #include "net/spdy/spdy_test_util_common.h"
30 #include "net/ssl/default_channel_id_store.h" 30 #include "net/ssl/default_channel_id_store.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 32
33 namespace net { 33 namespace net {
34 34
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_); 96 SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_);
97 session_ = CreateInsecureSpdySession(http_session_, key, BoundNetLog()); 97 session_ = CreateInsecureSpdySession(http_session_, key, BoundNetLog());
98 } 98 }
99 99
100 void TestSendCredentials( 100 void TestSendCredentials(
101 ChannelIDService* channel_id_service, 101 ChannelIDService* channel_id_service,
102 const std::string& cert, 102 const std::string& cert,
103 const std::string& proof); 103 const std::string& proof);
104 104
105 SpdyTestUtil spdy_util_; 105 SpdyTestUtil spdy_util_;
106 CapturingNetLog net_log_; 106 TestNetLog net_log_;
107 SpdySessionDependencies session_deps_; 107 SpdySessionDependencies session_deps_;
108 scoped_ptr<DeterministicSocketData> deterministic_data_; 108 scoped_ptr<DeterministicSocketData> deterministic_data_;
109 scoped_refptr<HttpNetworkSession> http_session_; 109 scoped_refptr<HttpNetworkSession> http_session_;
110 base::WeakPtr<SpdySession> session_; 110 base::WeakPtr<SpdySession> session_;
111 111
112 private: 112 private:
113 MockECSignatureCreatorFactory ec_signature_creator_factory_; 113 MockECSignatureCreatorFactory ec_signature_creator_factory_;
114 }; 114 };
115 115
116 INSTANTIATE_TEST_CASE_P(NextProto, 116 INSTANTIATE_TEST_CASE_P(NextProto,
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 ASSERT_TRUE(response.headers.get()); 748 ASSERT_TRUE(response.headers.get());
749 ASSERT_EQ(200, response.headers->response_code()); 749 ASSERT_EQ(200, response.headers->response_code());
750 EXPECT_TRUE(deterministic_data_->at_read_eof()); 750 EXPECT_TRUE(deterministic_data_->at_read_eof());
751 EXPECT_TRUE(deterministic_data_->at_write_eof()); 751 EXPECT_TRUE(deterministic_data_->at_write_eof());
752 } 752 }
753 753
754 // TODO(willchan): Write a longer test for SpdyStream that exercises all 754 // TODO(willchan): Write a longer test for SpdyStream that exercises all
755 // methods. 755 // methods.
756 756
757 } // namespace net 757 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/websocket_transport_client_socket_pool_unittest.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698