third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.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/ScrollbarThemeAuraTest.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlayTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 591da78f6651cd8f26876be8258a766aee892684..e877aa933e7c53224492a8e319eb981bddba6412 100644

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

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

@@ -9,7 +9,7 @@

namespace blink {

-using testing::Return;

+using ::testing::Return;

namespace {

@@ -29,7 +29,7 @@ class ScrollbarThemeAuraButtonOverride final : public ScrollbarThemeAura {

} // namespace

-using ScrollbarThemeAuraTest = testing::Test;

+using ScrollbarThemeAuraTest = ::testing::Test;

TEST_F(ScrollbarThemeAuraTest, ButtonSizeHorizontal) {

ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>