summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/heartbeat_sender_unittest.cc4
-rw-r--r--remoting/host/json_host_config_unittest.cc8
-rw-r--r--remoting/host/simple_host_process.cc4
-rw-r--r--remoting/jingle_glue/channel_socket_adapter_unittest.cc8
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.cc2
-rw-r--r--remoting/jingle_glue/stream_socket_adapter_unittest.cc12
-rw-r--r--remoting/protocol/host_message_dispatcher.cc4
-rw-r--r--remoting/protocol/jingle_chromotocol_connection_unittest.cc27
-rw-r--r--remoting/protocol/jingle_chromotocol_server.cc4
-rw-r--r--remoting/protocol/message_decoder_unittest.cc2
-rw-r--r--remoting/protocol/protocol_test_client.cc4
-rw-r--r--remoting/protocol/util.cc2
12 files changed, 41 insertions, 40 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 6610607..c5f03a8 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -86,7 +86,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) {
// |iq_request| is freed by HeartbeatSender.
MockIqRequest* iq_request = new MockIqRequest(jingle_client_);
- scoped_refptr<HeartbeatSender> heartbeat_sender = new HeartbeatSender();
+ scoped_refptr<HeartbeatSender> heartbeat_sender(new HeartbeatSender());
ASSERT_TRUE(heartbeat_sender->Init(config_, jingle_client_));
EXPECT_CALL(*jingle_client_, CreateIqRequest())
@@ -105,7 +105,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) {
TEST_F(HeartbeatSenderTest, CreateHeartbeatMessage) {
// This test validates format of the heartbeat stanza.
- scoped_refptr<HeartbeatSender> heartbeat_sender = new HeartbeatSender();
+ scoped_refptr<HeartbeatSender> heartbeat_sender(new HeartbeatSender());
ASSERT_TRUE(heartbeat_sender->Init(config_, jingle_client_));
int64 start_time = static_cast<int64>(base::Time::Now().ToDoubleT());
diff --git a/remoting/host/json_host_config_unittest.cc b/remoting/host/json_host_config_unittest.cc
index bd1bc14..14ee9bd 100644
--- a/remoting/host/json_host_config_unittest.cc
+++ b/remoting/host/json_host_config_unittest.cc
@@ -54,8 +54,8 @@ TEST_F(JsonHostConfigTest, InvalidFile) {
ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
FilePath non_existent_file =
test_dir_.path().AppendASCII("non_existent.json");
- scoped_refptr<JsonHostConfig> target =
- new JsonHostConfig(non_existent_file, message_loop_proxy_.get());
+ scoped_refptr<JsonHostConfig> target(
+ new JsonHostConfig(non_existent_file, message_loop_proxy_.get()));
EXPECT_FALSE(target->Read());
}
@@ -63,8 +63,8 @@ TEST_F(JsonHostConfigTest, Read) {
ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
FilePath test_file = test_dir_.path().AppendASCII("read.json");
WriteTestFile(test_file);
- scoped_refptr<JsonHostConfig> target =
- new JsonHostConfig(test_file, message_loop_proxy_.get());
+ scoped_refptr<JsonHostConfig> target(
+ new JsonHostConfig(test_file, message_loop_proxy_.get()));
ASSERT_TRUE(target->Read());
std::string value;
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 744e100..d998ef9 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -133,12 +133,12 @@ int main(int argc, char** argv) {
context.Start();
// Construct a chromoting host.
- scoped_refptr<remoting::ChromotingHost> host =
+ scoped_refptr<remoting::ChromotingHost> host(
new remoting::ChromotingHost(&context,
config,
capturer.release(),
encoder.release(),
- event_handler.release());
+ event_handler.release()));
// Let the chromoting host run until the shutdown task is executed.
MessageLoop message_loop(MessageLoop::TYPE_UI);
diff --git a/remoting/jingle_glue/channel_socket_adapter_unittest.cc b/remoting/jingle_glue/channel_socket_adapter_unittest.cc
index ac2c591..867332f 100644
--- a/remoting/jingle_glue/channel_socket_adapter_unittest.cc
+++ b/remoting/jingle_glue/channel_socket_adapter_unittest.cc
@@ -64,7 +64,7 @@ class TransportChannelSocketAdapterTest : public testing::Test {
// Verify that Read() returns net::ERR_IO_PENDING.
TEST_F(TransportChannelSocketAdapterTest, Read) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kBufferSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
int result = target_->Read(buffer, kBufferSize, &callback_);
ASSERT_EQ(net::ERR_IO_PENDING, result);
@@ -75,7 +75,7 @@ TEST_F(TransportChannelSocketAdapterTest, Read) {
// Verify that Read() after Close() returns error.
TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kBufferSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
int result = target_->Read(buffer, kBufferSize, &callback_);
ASSERT_EQ(net::ERR_IO_PENDING, result);
@@ -89,7 +89,7 @@ TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
// Verify that Write sends the packet and returns correct result.
TEST_F(TransportChannelSocketAdapterTest, Write) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kTestDataSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
.WillOnce(Return(kTestDataSize));
@@ -101,7 +101,7 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
// Verify that the message is still send if Write() is called while
// socket is not open yet, and that the callback is called.
TEST_F(TransportChannelSocketAdapterTest, WritePending) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kTestDataSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize))
.Times(2)
diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc
index f7c324a..c67115f 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.cc
+++ b/remoting/jingle_glue/ssl_socket_adapter.cc
@@ -84,7 +84,7 @@ int SSLSocketAdapter::Send(const void* buf, size_t len) {
if (ssl_state_ != SSLSTATE_CONNECTED) {
return AsyncSocketAdapter::Send(buf, len);
} else {
- scoped_refptr<net::IOBuffer> transport_buf = new net::IOBuffer(len);
+ scoped_refptr<net::IOBuffer> transport_buf(new net::IOBuffer(len));
memcpy(transport_buf->data(), buf, len);
int result = ssl_socket_->Write(transport_buf, len, NULL);
diff --git a/remoting/jingle_glue/stream_socket_adapter_unittest.cc b/remoting/jingle_glue/stream_socket_adapter_unittest.cc
index 7d1dd62..01997dc 100644
--- a/remoting/jingle_glue/stream_socket_adapter_unittest.cc
+++ b/remoting/jingle_glue/stream_socket_adapter_unittest.cc
@@ -54,7 +54,7 @@ class StreamSocketAdapterTest : public testing::Test {
// Verify that Read() calls Read() in stream.
TEST_F(StreamSocketAdapterTest, Read) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kBufferSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
EXPECT_CALL(*stream_, Read(buffer->data(), kBufferSize, _, _))
.WillOnce(DoAll(SetArgumentPointee<2>(kTestDataSize),
@@ -67,7 +67,7 @@ TEST_F(StreamSocketAdapterTest, Read) {
// Verify that read callback is called for pending reads.
TEST_F(StreamSocketAdapterTest, ReadPending) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kBufferSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
EXPECT_CALL(*stream_, Read(buffer->data(), kBufferSize, _, _))
.Times(2)
@@ -84,7 +84,7 @@ TEST_F(StreamSocketAdapterTest, ReadPending) {
// Verify that Read() returns error after Close().
TEST_F(StreamSocketAdapterTest, ReadClose) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kBufferSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kBufferSize));
EXPECT_CALL(*stream_, Read(buffer->data(), kBufferSize, _, _))
.WillOnce(Return(talk_base::SR_BLOCK));
@@ -102,7 +102,7 @@ TEST_F(StreamSocketAdapterTest, ReadClose) {
// Verify that Write() calls stream's Write() and returns result.
TEST_F(StreamSocketAdapterTest, Write) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kTestDataSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(*stream_, Write(buffer->data(), kTestDataSize, _, _))
.WillOnce(DoAll(SetArgumentPointee<2>(kTestDataSize),
@@ -115,7 +115,7 @@ TEST_F(StreamSocketAdapterTest, Write) {
// Verify that write callback is called for pending writes.
TEST_F(StreamSocketAdapterTest, WritePending) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kTestDataSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(*stream_, Write(buffer->data(), kTestDataSize, _, _))
.Times(2)
@@ -132,7 +132,7 @@ TEST_F(StreamSocketAdapterTest, WritePending) {
// Verify that Write() returns error after Close().
TEST_F(StreamSocketAdapterTest, WriteClose) {
- scoped_refptr<IOBuffer> buffer = new IOBuffer(kTestDataSize);
+ scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
EXPECT_CALL(*stream_, Write(buffer->data(), kTestDataSize, _, _))
.WillOnce(Return(talk_base::SR_BLOCK));
diff --git a/remoting/protocol/host_message_dispatcher.cc b/remoting/protocol/host_message_dispatcher.cc
index 818934f..768789e 100644
--- a/remoting/protocol/host_message_dispatcher.cc
+++ b/remoting/protocol/host_message_dispatcher.cc
@@ -46,8 +46,8 @@ bool HostMessageDispatcher::Initialize(
void HostMessageDispatcher::OnControlMessageReceived(
ClientControlMessage* message) {
- scoped_refptr<RefCountedMessage<ClientControlMessage> > ref_msg =
- new RefCountedMessage<ClientControlMessage>(message);
+ scoped_refptr<RefCountedMessage<ClientControlMessage> > ref_msg(
+ new RefCountedMessage<ClientControlMessage>(message));
if (message->has_suggest_screen_resolution_request()) {
control_message_handler_->OnSuggestScreenResolutionRequest(
message->suggest_screen_resolution_request(),
diff --git a/remoting/protocol/jingle_chromotocol_connection_unittest.cc b/remoting/protocol/jingle_chromotocol_connection_unittest.cc
index d8f12cd..2d0cb8e 100644
--- a/remoting/protocol/jingle_chromotocol_connection_unittest.cc
+++ b/remoting/protocol/jingle_chromotocol_connection_unittest.cc
@@ -118,10 +118,11 @@ class JingleChromotocolConnectionTest : public testing::Test {
&MockServerCallback::OnIncomingConnection));
client_server_ = new JingleChromotocolServer(&thread_);
client_server_->set_allow_local_ips(true);
- client_server_->Init(SessionManagerPair::kClientJid,
- session_manager_pair_->client_session_manager(),
- NewCallback(&client_server_callback_,
- &MockServerCallback::OnIncomingConnection));
+ client_server_->Init(
+ SessionManagerPair::kClientJid,
+ session_manager_pair_->client_session_manager(),
+ NewCallback(&client_server_callback_,
+ &MockServerCallback::OnIncomingConnection));
}
bool InitiateConnection() {
@@ -422,7 +423,7 @@ class UDPChannelTester : public ChannelTesterBase {
return;
}
- scoped_refptr<net::IOBuffer> packet = new net::IOBuffer(kMessageSize);
+ scoped_refptr<net::IOBuffer> packet(new net::IOBuffer(kMessageSize));
memset(packet->data(), 123, kMessageSize);
sent_packets_[packets_sent_] = packet;
// Put index of this packet in the beginning of the packet body.
@@ -551,9 +552,9 @@ TEST_F(JingleChromotocolConnectionTest, Connect) {
TEST_F(JingleChromotocolConnectionTest, TestControlChannel) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
- scoped_refptr<TCPChannelTester> tester =
+ scoped_refptr<TCPChannelTester> tester(
new TCPChannelTester(thread_.message_loop(), host_connection_,
- client_connection_);
+ client_connection_));
tester->Start(ChannelTesterBase::CONTROL);
ASSERT_TRUE(tester->WaitFinished());
tester->CheckResults();
@@ -567,9 +568,9 @@ TEST_F(JingleChromotocolConnectionTest, TestControlChannel) {
TEST_F(JingleChromotocolConnectionTest, TestVideoChannel) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
- scoped_refptr<TCPChannelTester> tester =
+ scoped_refptr<TCPChannelTester> tester(
new TCPChannelTester(thread_.message_loop(), host_connection_,
- client_connection_);
+ client_connection_));
tester->Start(ChannelTesterBase::VIDEO);
ASSERT_TRUE(tester->WaitFinished());
tester->CheckResults();
@@ -582,9 +583,9 @@ TEST_F(JingleChromotocolConnectionTest, TestVideoChannel) {
TEST_F(JingleChromotocolConnectionTest, TestEventChannel) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
- scoped_refptr<TCPChannelTester> tester =
+ scoped_refptr<TCPChannelTester> tester(
new TCPChannelTester(thread_.message_loop(), host_connection_,
- client_connection_);
+ client_connection_));
tester->Start(ChannelTesterBase::EVENT);
ASSERT_TRUE(tester->WaitFinished());
tester->CheckResults();
@@ -597,9 +598,9 @@ TEST_F(JingleChromotocolConnectionTest, TestEventChannel) {
TEST_F(JingleChromotocolConnectionTest, TestVideoRtpChannel) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
- scoped_refptr<UDPChannelTester> tester =
+ scoped_refptr<UDPChannelTester> tester(
new UDPChannelTester(thread_.message_loop(), host_connection_,
- client_connection_);
+ client_connection_));
tester->Start(ChannelTesterBase::VIDEO_RTP);
ASSERT_TRUE(tester->WaitFinished());
tester->CheckResults();
diff --git a/remoting/protocol/jingle_chromotocol_server.cc b/remoting/protocol/jingle_chromotocol_server.cc
index 796c63b..2300243 100644
--- a/remoting/protocol/jingle_chromotocol_server.cc
+++ b/remoting/protocol/jingle_chromotocol_server.cc
@@ -223,8 +223,8 @@ scoped_refptr<ChromotocolConnection> JingleChromotocolServer::Connect(
CandidateChromotocolConfig* chromotocol_config,
ChromotocolConnection::StateChangeCallback* state_change_callback) {
// Can be called from any thread.
- scoped_refptr<JingleChromotocolConnection> connection =
- new JingleChromotocolConnection(this);
+ scoped_refptr<JingleChromotocolConnection> connection(
+ new JingleChromotocolConnection(this));
connection->set_candidate_config(chromotocol_config);
message_loop()->PostTask(
FROM_HERE, NewRunnableMethod(this, &JingleChromotocolServer::DoConnect,
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc
index c2772c8..a2d4b20 100644
--- a/remoting/protocol/message_decoder_unittest.cc
+++ b/remoting/protocol/message_decoder_unittest.cc
@@ -83,7 +83,7 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
int read = std::min(size - i, read_sequence[i % sequence_size]);
// And then prepare an IOBuffer for feeding it.
- scoped_refptr<net::IOBuffer> buffer = new net::IOBuffer(read);
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(read));
memcpy(buffer->data(), test_data + i, read);
decoder.ParseMessages(buffer, read, &message_list);
i += read;
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index 8113db7..d61c0b5 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -125,7 +125,7 @@ void ProtocolTestConnection::Write(const std::string& str) {
if (str.empty())
return;
- scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(str.length());
+ scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(str.length()));
memcpy(buf->data(), str.c_str(), str.length());
message_loop_->PostTask(
FROM_HERE, NewRunnableMethod(
@@ -362,7 +362,7 @@ int main(int argc, char** argv) {
usage(argv[0]);
std::string auth_token(cmd_line->GetSwitchValueASCII("auth_token"));
- scoped_refptr<ProtocolTestClient> client = new ProtocolTestClient();
+ scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient());
client->Run(username, auth_token, host_jid);
diff --git a/remoting/protocol/util.cc b/remoting/protocol/util.cc
index 5a23c93..a12040b 100644
--- a/remoting/protocol/util.cc
+++ b/remoting/protocol/util.cc
@@ -18,7 +18,7 @@ scoped_refptr<net::IOBufferWithSize> SerializeAndFrameMessage(
// int32 of the serialized message size for framing.
const int kExtraBytes = sizeof(int32);
int size = msg.ByteSize() + kExtraBytes;
- scoped_refptr<net::IOBufferWithSize> buffer = new net::IOBufferWithSize(size);
+ scoped_refptr<net::IOBufferWithSize> buffer(new net::IOBufferWithSize(size));
talk_base::SetBE32(buffer->data(), msg.GetCachedSize());
msg.SerializeWithCachedSizesToArray(
reinterpret_cast<uint8*>(buffer->data()) + kExtraBytes);
generated by cgit v1.1 at 2025-02-16 06:06:59 +0000