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

Side by Side Diff: net/spdy/spdy_network_transaction_unittest.cc

Issue 934823005: Rename SPDY netlog strings to HTTP2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename SOURCE_SPDY_SESSION. Created 5 years, 10 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
« no previous file with comments | « net/spdy/spdy_http_stream.cc ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 3762 matching lines...) Expand 10 before | Expand all | Expand 10 after
3773 net::NetLog::PHASE_END); 3773 net::NetLog::PHASE_END);
3774 pos = net::ExpectLogContainsSomewhere(entries, pos + 1, 3774 pos = net::ExpectLogContainsSomewhere(entries, pos + 1,
3775 net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY, 3775 net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
3776 net::NetLog::PHASE_BEGIN); 3776 net::NetLog::PHASE_BEGIN);
3777 pos = net::ExpectLogContainsSomewhere(entries, pos + 1, 3777 pos = net::ExpectLogContainsSomewhere(entries, pos + 1,
3778 net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY, 3778 net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
3779 net::NetLog::PHASE_END); 3779 net::NetLog::PHASE_END);
3780 3780
3781 // Check that we logged all the headers correctly 3781 // Check that we logged all the headers correctly
3782 pos = net::ExpectLogContainsSomewhere( 3782 pos = net::ExpectLogContainsSomewhere(
3783 entries, 0, 3783 entries, 0, net::NetLog::TYPE_HTTP2_SESSION_SYN_STREAM,
3784 net::NetLog::TYPE_SPDY_SESSION_SYN_STREAM,
3785 net::NetLog::PHASE_NONE); 3784 net::NetLog::PHASE_NONE);
3786 3785
3787 base::ListValue* header_list; 3786 base::ListValue* header_list;
3788 ASSERT_TRUE(entries[pos].params.get()); 3787 ASSERT_TRUE(entries[pos].params.get());
3789 ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list)); 3788 ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list));
3790 3789
3791 std::vector<std::string> expected; 3790 std::vector<std::string> expected;
3792 expected.push_back(std::string(spdy_util_.GetHostKey()) + ": www.google.com"); 3791 expected.push_back(std::string(spdy_util_.GetHostKey()) + ": www.google.com");
3793 expected.push_back(std::string(spdy_util_.GetPathKey()) + ": /"); 3792 expected.push_back(std::string(spdy_util_.GetPathKey()) + ": /");
3794 expected.push_back(std::string(spdy_util_.GetSchemeKey()) + ": http"); 3793 expected.push_back(std::string(spdy_util_.GetSchemeKey()) + ": http");
(...skipping 3025 matching lines...) Expand 10 before | Expand all | Expand 10 after
6820 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { 6819 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
6821 scoped_ptr<SSLSocketDataProvider> ssl_provider( 6820 scoped_ptr<SSLSocketDataProvider> ssl_provider(
6822 new SSLSocketDataProvider(ASYNC, OK)); 6821 new SSLSocketDataProvider(ASYNC, OK));
6823 // Set to TLS_RSA_WITH_NULL_MD5 6822 // Set to TLS_RSA_WITH_NULL_MD5
6824 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); 6823 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
6825 6824
6826 RunTLSUsageCheckTest(ssl_provider.Pass()); 6825 RunTLSUsageCheckTest(ssl_provider.Pass());
6827 } 6826 }
6828 6827
6829 } // namespace net 6828 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_http_stream.cc ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698