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

Unified Diff: remoting/test/protocol_perftest.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/test/fake_socket_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/test/protocol_perftest.cc
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index 1194f2bcc79bdc21a5a45514f2f18dad3dee4e86..7c4ffa369520e5c27c779ac3f272de732e8912de 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -111,14 +111,14 @@ class ProtocolPerfTest
void SetPairingResponse(
const protocol::PairingResponse& pairing_response) override {}
void DeliverHostMessage(const protocol::ExtensionMessage& message) override {}
- protocol::ClipboardStub* GetClipboardStub() override { return NULL; }
+ protocol::ClipboardStub* GetClipboardStub() override { return nullptr; }
protocol::CursorShapeStub* GetCursorShapeStub() override {
return &cursor_shape_stub_;
}
// VideoRenderer interface.
void OnSessionConfig(const protocol::SessionConfig& config) override {}
- ChromotingStats* GetStats() override { return NULL; }
+ ChromotingStats* GetStats() override { return nullptr; }
void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
const base::Closure& done) override {
if (video_packet->data().empty()) {
@@ -270,7 +270,7 @@ class ProtocolPerfTest
host_secret.value = "123456";
scoped_ptr<protocol::AuthenticatorFactory> auth_factory =
protocol::Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
- true, kHostOwner, host_cert, key_pair, host_secret, NULL);
+ true, kHostOwner, host_cert, key_pair, host_secret, nullptr);
host_->SetAuthenticatorFactory(auth_factory.Pass());
host_->AddStatusObserver(this);
@@ -405,7 +405,7 @@ TEST_P(ProtocolPerfTest, StreamFrameRate) {
ReceiveFrame(&latency);
LOG(INFO) << "First frame latency: " << latency.InMillisecondsF() << "ms";
- ReceiveFrames(20, NULL);
+ ReceiveFrames(20, nullptr);
base::TimeTicks started = base::TimeTicks::Now();
ReceiveFrames(40, &latency);
@@ -465,7 +465,7 @@ TEST_P(ProtocolPerfTest, IntermittentChanges) {
StartHostAndClient(protocol::ChannelConfig::CODEC_VERBATIM);
ASSERT_NO_FATAL_FAILURE(WaitConnected());
- ReceiveFrame(NULL);
+ ReceiveFrame(nullptr);
base::TimeDelta expected = GetParam().latency_average;
if (GetParam().bandwidth > 0) {
« no previous file with comments | « remoting/test/fake_socket_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698