diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-01-09 11:33:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 19:34:12 +0000 |
| commit | c5f104b31e1a640e4adaeaac7fca30c72eb04138 (patch) | |
| tree | f1de6d1828d8eaef25a9aa4e07a4a4d46764f045 /remoting/test/protocol_perftest.cc | |
| parent | a261cb0d164c411e916fb62f4c560ce5acb260f3 (diff) | |
| download | chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.zip chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.gz chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.bz2 | |
replace NULL->nullptr in src/remoting.
Review URL: https://codereview.chromium.org/810133003
Cr-Commit-Position: refs/heads/master@{#310816}
Diffstat (limited to 'remoting/test/protocol_perftest.cc')
| -rw-r--r-- | remoting/test/protocol_perftest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index 1194f2b..7c4ffa3 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) { |