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

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

Issue 2084863002: Update Zlib to version 1.2.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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_framer_test.cc ('k') | third_party/zlib/README.chromium » ('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 "net/spdy/spdy_session.h" 5 #include "net/spdy/spdy_session.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 1857 matching lines...) Expand 10 before | Expand all | Expand 10 after
1868 spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND); 1868 spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
1869 EXPECT_TRUE(spdy_stream->HasUrlFromHeaders()); 1869 EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
1870 1870
1871 // Write request headers & capture resulting histogram update. 1871 // Write request headers & capture resulting histogram update.
1872 base::HistogramTester histogram_tester; 1872 base::HistogramTester histogram_tester;
1873 1873
1874 base::RunLoop().RunUntilIdle(); 1874 base::RunLoop().RunUntilIdle();
1875 // Regression test of compression performance under the request fixture. 1875 // Regression test of compression performance under the request fixture.
1876 switch (spdy_util_.spdy_version()) { 1876 switch (spdy_util_.spdy_version()) {
1877 case SPDY3: 1877 case SPDY3:
1878 #if defined(USE_SYSTEM_ZLIB)
1878 histogram_tester.ExpectBucketCount( 1879 histogram_tester.ExpectBucketCount(
1879 "Net.SpdySynStreamCompressionPercentage", 30, 1); 1880 "Net.SpdySynStreamCompressionPercentage", 30, 1);
1881 #else
1882 histogram_tester.ExpectBucketCount(
1883 "Net.SpdySynStreamCompressionPercentage", 31, 1);
1884 #endif
1880 break; 1885 break;
1881 case HTTP2: 1886 case HTTP2:
1882 histogram_tester.ExpectBucketCount( 1887 histogram_tester.ExpectBucketCount(
1883 "Net.SpdySynStreamCompressionPercentage", 81, 1); 1888 "Net.SpdySynStreamCompressionPercentage", 81, 1);
1884 break; 1889 break;
1885 default: 1890 default:
1886 NOTREACHED(); 1891 NOTREACHED();
1887 } 1892 }
1888 1893
1889 // Read and process EOF. 1894 // Read and process EOF.
(...skipping 3856 matching lines...) Expand 10 before | Expand all | Expand 10 after
5746 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(), 5751 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
5747 "spdy_pooling.pem"); 5752 "spdy_pooling.pem");
5748 ssl_info.is_issued_by_known_root = true; 5753 ssl_info.is_issued_by_known_root = true;
5749 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin)); 5754 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
5750 5755
5751 EXPECT_TRUE(SpdySession::CanPool( 5756 EXPECT_TRUE(SpdySession::CanPool(
5752 &tss, ssl_info, "www.example.org", "mail.example.org")); 5757 &tss, ssl_info, "www.example.org", "mail.example.org"));
5753 } 5758 }
5754 5759
5755 } // namespace net 5760 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_framer_test.cc ('k') | third_party/zlib/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698