gpu/command_buffer/service/test_helper.cc - Issue 851503003: Update from https://crrev.com/311076

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: gpu/command_buffer/service/test_helper.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.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:

Index: gpu/command_buffer/service/test_helper.cc

diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc

index f0deec206c3b03b1c783d371777d26e6cf839acb..550e0cda36f948e7611992314d8778fe75ce3255 100644

--- a/gpu/command_buffer/service/test_helper.cc

+++ b/gpu/command_buffer/service/test_helper.cc

@@ -411,7 +411,7 @@ void TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

EXPECT_CALL(*gl, BindTexture(GL_TEXTURE_2D, tx_ids[0]))

.Times(1)

.RetiresOnSaturation();

-#if DCHECK_IS_ON

+#if DCHECK_IS_ON()

EXPECT_CALL(*gl, GetError())

.WillOnce(Return(GL_NO_ERROR))

.RetiresOnSaturation();

@@ -475,7 +475,7 @@ void TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(

EXPECT_CALL(*gl, BindTexture(GL_TEXTURE_2D, tx_ids[0]))

.Times(1)

.RetiresOnSaturation();

-#if DCHECK_IS_ON

+#if DCHECK_IS_ON()

EXPECT_CALL(*gl, GetError())

.WillOnce(Return(GL_NO_ERROR))

.RetiresOnSaturation();