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

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

Issue 1579213006: Remove unused SPDY/3 enum values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove trivial comparisons; change non-trivial ones. Created 4 years, 11 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_session.cc ('k') | no next file » | 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 <utility> 7 #include <utility>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 } 1551 }
1552 writes.push_back(CreateMockWrite(*settings_frame)); 1552 writes.push_back(CreateMockWrite(*settings_frame));
1553 1553
1554 SettingsMap server_settings; 1554 SettingsMap server_settings;
1555 const uint32_t initial_max_concurrent_streams = 1; 1555 const uint32_t initial_max_concurrent_streams = 1;
1556 server_settings[SETTINGS_MAX_CONCURRENT_STREAMS] = 1556 server_settings[SETTINGS_MAX_CONCURRENT_STREAMS] =
1557 SettingsFlagsAndValue(SETTINGS_FLAG_PERSISTED, 1557 SettingsFlagsAndValue(SETTINGS_FLAG_PERSISTED,
1558 initial_max_concurrent_streams); 1558 initial_max_concurrent_streams);
1559 scoped_ptr<SpdyFrame> server_settings_frame( 1559 scoped_ptr<SpdyFrame> server_settings_frame(
1560 spdy_util_.ConstructSpdySettings(server_settings)); 1560 spdy_util_.ConstructSpdySettings(server_settings));
1561 if (GetProtocol() <= kProtoSPDY31) { 1561 if (GetProtocol() == kProtoSPDY31) {
1562 writes.push_back(CreateMockWrite(*server_settings_frame)); 1562 writes.push_back(CreateMockWrite(*server_settings_frame));
1563 } 1563 }
1564 1564
1565 StaticSocketDataProvider data(reads, arraysize(reads), writes.data(), 1565 StaticSocketDataProvider data(reads, arraysize(reads), writes.data(),
1566 writes.size()); 1566 writes.size());
1567 session_deps_.socket_factory->AddSocketDataProvider(&data); 1567 session_deps_.socket_factory->AddSocketDataProvider(&data);
1568 1568
1569 CreateNetworkSession(); 1569 CreateNetworkSession();
1570 1570
1571 spdy_session_pool_->http_server_properties()->SetSpdySetting( 1571 spdy_session_pool_->http_server_properties()->SetSpdySetting(
(...skipping 3790 matching lines...) Expand 10 before | Expand all | Expand 10 after
5362 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(), 5362 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
5363 "spdy_pooling.pem"); 5363 "spdy_pooling.pem");
5364 ssl_info.is_issued_by_known_root = true; 5364 ssl_info.is_issued_by_known_root = true;
5365 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin)); 5365 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
5366 5366
5367 EXPECT_TRUE(SpdySession::CanPool( 5367 EXPECT_TRUE(SpdySession::CanPool(
5368 &tss, ssl_info, "www.example.org", "mail.example.org")); 5368 &tss, ssl_info, "www.example.org", "mail.example.org"));
5369 } 5369 }
5370 5370
5371 } // namespace net 5371 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698