third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp - Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing

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: third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing (Closed)

Patch Set: Created 3 years, 5 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 | « third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp ('k') | third_party/WebKit/Source/core/paint/PaintPropertyTreePrinterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

index c87ab2c011259b96f66f8542e19d1994c574201f..3d2a99f1bc21de6d4268f08fa5dd9b350cf41d27 100644

--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

@@ -14,7 +14,7 @@

#include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"

#include "testing/gmock/include/gmock/gmock.h"

-using testing::_;

+using ::testing::_;

namespace blink {

namespace {

@@ -38,7 +38,7 @@ class PaintLayerScrollableAreaTest : public RenderingTest {

chrome_client_(new MockChromeClient) {}

~PaintLayerScrollableAreaTest() {

- testing::Mock::VerifyAndClearExpectations(&GetChromeClient());

+ ::testing::Mock::VerifyAndClearExpectations(&GetChromeClient());

}

MockChromeClient& GetChromeClient() const override { return *chrome_client_; }