third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp - Issue 2967013002: 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/platform/scroll/ScrollableAreaTest.cpp

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

Patch Set: Dropped mojo parts that need another review. 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:

Index: third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp

index 12e17d7152d8ff5b0d54804f7fcdd89bbd2d638d..1c3d24405d9b8a1a9a2c3d27ae18b76bf5d44862 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp

+++ b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp

@@ -20,8 +20,8 @@ namespace blink {

namespace {

-using testing::_;

-using testing::Return;

+using ::testing::_;

+using ::testing::Return;

class ScrollbarThemeWithMockInvalidation : public ScrollbarThemeMock {

public:

@@ -32,7 +32,7 @@ class ScrollbarThemeWithMockInvalidation : public ScrollbarThemeMock {

} // namespace

-using ScrollableAreaTest = testing::Test;

+using ScrollableAreaTest = ::testing::Test;

TEST_F(ScrollableAreaTest, ScrollAnimatorCurrentPositionShouldBeSync) {

ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>