third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h - 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/css/threaded/MultiThreadedTestUtil.h

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/css/parser/CSSLazyParsingTest.cpp ('k') | third_party/WebKit/Source/core/dom/IdleDeadlineTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h

diff --git a/third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h b/third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h

index 6666cedee815d2fe78daa7239488d61aa4deaa17..7d27ea6169c5a5e00b2b111b46471fbdb09e1fe7 100644

--- a/third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h

+++ b/third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h

@@ -24,7 +24,7 @@ namespace blink {

// instead of the normal gtest macros for MultiThreadedTests.

// It guarantees that those tests are only run on Thread Sanitizer enabled

// builds.

-// Also, TSAN_TEST subclasses MultiThreadTest instead of testing::Test.

+// Also, TSAN_TEST subclasses MultiThreadTest instead of ::testing::Test.

#if defined(THREAD_SANITIZER)

#define TSAN_TEST(test_case_name, test_name) \

@@ -45,7 +45,7 @@ namespace blink {

#endif

-class MultiThreadedTest : public testing::Test {

+class MultiThreadedTest : public ::testing::Test {

public:

// RunOnThreads run a closure num_threads * callbacks_per_thread times.

// The default for this is 10*100 = 1000 times.