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

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

Issue 2503993002: Change unique_ptr::reset() for std::move (Closed)
Patch Set: Change unique_ptr::reset() for std::move Created 4 years 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_network_transaction_unittest.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 <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 5059 matching lines...) Expand 10 before | Expand all | Expand 10 after
5070 CreateMockWrite(req, 0), CreateMockWrite(rst, 5), 5070 CreateMockWrite(req, 0), CreateMockWrite(rst, 5),
5071 }; 5071 };
5072 5072
5073 SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes)); 5073 SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
5074 session_deps_.socket_factory->AddSocketDataProvider(&data); 5074 session_deps_.socket_factory->AddSocketDataProvider(&data);
5075 5075
5076 std::unique_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate()); 5076 std::unique_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate());
5077 proxy_delegate->set_trusted_spdy_proxy( 5077 proxy_delegate->set_trusted_spdy_proxy(
5078 net::ProxyServer(net::ProxyServer::SCHEME_HTTPS, 5078 net::ProxyServer(net::ProxyServer::SCHEME_HTTPS,
5079 HostPortPair(GURL(kDefaultUrl).host(), 443))); 5079 HostPortPair(GURL(kDefaultUrl).host(), 443)));
5080 session_deps_.proxy_delegate.reset(proxy_delegate.release()); 5080 session_deps_.proxy_delegate = std::move(proxy_delegate);
5081 5081
5082 AddSSLSocketData(); 5082 AddSSLSocketData();
5083 5083
5084 CreateNetworkSession(); 5084 CreateNetworkSession();
5085 CreateSecureSpdySession(); 5085 CreateSecureSpdySession();
5086 5086
5087 base::WeakPtr<SpdyStream> spdy_stream = 5087 base::WeakPtr<SpdyStream> spdy_stream =
5088 CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, session_, 5088 CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, session_,
5089 test_url_, LOWEST, NetLogWithSource()); 5089 test_url_, LOWEST, NetLogWithSource());
5090 ASSERT_TRUE(spdy_stream); 5090 ASSERT_TRUE(spdy_stream);
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
5884 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(), 5884 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
5885 "spdy_pooling.pem"); 5885 "spdy_pooling.pem");
5886 ssl_info.is_issued_by_known_root = true; 5886 ssl_info.is_issued_by_known_root = true;
5887 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin)); 5887 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
5888 5888
5889 EXPECT_TRUE(SpdySession::CanPool( 5889 EXPECT_TRUE(SpdySession::CanPool(
5890 &tss, ssl_info, "www.example.org", "mail.example.org")); 5890 &tss, ssl_info, "www.example.org", "mail.example.org"));
5891 } 5891 }
5892 5892
5893 } // namespace net 5893 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698