cc/scheduler/begin_frame_source_unittest.cc - Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/scheduler/begin_frame_source_unittest.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Formating fix. Created 6 years, 2 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

Index: cc/scheduler/begin_frame_source_unittest.cc

diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc

index 8abf1a9edfd8bf95bb86edbc0c6e2538a19196b1..485f16ab00fb5663e3eafdc58658c098527f842b 100644

--- a/cc/scheduler/begin_frame_source_unittest.cc

+++ b/cc/scheduler/begin_frame_source_unittest.cc

@@ -576,13 +576,13 @@ class BeginFrameSourceMultiplexerTest : public ::testing::Test {

};

TEST_F(BeginFrameSourceMultiplexerTest, SourcesManipulation) {

- EXPECT_EQ(NULL, mux_->ActiveSource());

+ EXPECT_EQ(nullptr, mux_->ActiveSource());

mux_->AddSource(source1_);

EXPECT_EQ(source1_, mux_->ActiveSource());

- mux_->SetActiveSource(NULL);

- EXPECT_EQ(NULL, mux_->ActiveSource());

+ mux_->SetActiveSource(nullptr);

+ EXPECT_EQ(nullptr, mux_->ActiveSource());

mux_->SetActiveSource(source1_);

« cc/scheduler/begin_frame_source.cc ('K') | « cc/scheduler/begin_frame_source.cc ('k') | cc/scheduler/delay_based_time_source.cc » ('j') | cc/test/test_web_graphics_context_3d.h » ('J')