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

Side by Side Diff: remoting/test/test_chromoting_client.cc

Issue 2253233004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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 | « remoting/test/protocol_perftest.cc ('k') | remoting/test/test_chromoting_client_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "remoting/test/test_chromoting_client.h" 5 #include "remoting/test/test_chromoting_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(), 115 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
116 request_context_getter, xmpp_server_config)); 116 request_context_getter, xmpp_server_config));
117 } 117 }
118 118
119 protocol::NetworkSettings network_settings( 119 protocol::NetworkSettings network_settings(
120 protocol::NetworkSettings::NAT_TRAVERSAL_FULL); 120 protocol::NetworkSettings::NAT_TRAVERSAL_FULL);
121 121
122 scoped_refptr<protocol::TransportContext> transport_context( 122 scoped_refptr<protocol::TransportContext> transport_context(
123 new protocol::TransportContext( 123 new protocol::TransportContext(
124 signal_strategy_.get(), 124 signal_strategy_.get(),
125 base::WrapUnique(new protocol::ChromiumPortAllocatorFactory()), 125 base::MakeUnique<protocol::ChromiumPortAllocatorFactory>(),
126 base::WrapUnique( 126 base::MakeUnique<ChromiumUrlRequestFactory>(request_context_getter),
127 new ChromiumUrlRequestFactory(request_context_getter)),
128 network_settings, protocol::TransportRole::CLIENT)); 127 network_settings, protocol::TransportRole::CLIENT));
129 128
130 protocol::ClientAuthenticationConfig client_auth_config; 129 protocol::ClientAuthenticationConfig client_auth_config;
131 client_auth_config.host_id = connection_setup_info.host_id; 130 client_auth_config.host_id = connection_setup_info.host_id;
132 client_auth_config.pairing_client_id = connection_setup_info.pairing_id; 131 client_auth_config.pairing_client_id = connection_setup_info.pairing_id;
133 client_auth_config.pairing_secret = connection_setup_info.shared_secret; 132 client_auth_config.pairing_secret = connection_setup_info.shared_secret;
134 133
135 if (!connection_setup_info.pin.empty()) { 134 if (!connection_setup_info.pin.empty()) {
136 client_auth_config.fetch_secret_callback = 135 client_auth_config.fetch_secret_callback =
137 base::Bind(&FetchSecret, connection_setup_info.pin); 136 base::Bind(&FetchSecret, connection_setup_info.pin);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 VLOG(1) << "TestChromotingClient::InjectClipboardEvent() Called"; 270 VLOG(1) << "TestChromotingClient::InjectClipboardEvent() Called";
272 } 271 }
273 272
274 void TestChromotingClient::SetCursorShape( 273 void TestChromotingClient::SetCursorShape(
275 const protocol::CursorShapeInfo& cursor_shape) { 274 const protocol::CursorShapeInfo& cursor_shape) {
276 VLOG(1) << "TestChromotingClient::SetCursorShape() Called"; 275 VLOG(1) << "TestChromotingClient::SetCursorShape() Called";
277 } 276 }
278 277
279 } // namespace test 278 } // namespace test
280 } // namespace remoting 279 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/test/protocol_perftest.cc ('k') | remoting/test/test_chromoting_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698