third_party/WebKit/Source/platform/TimerTest.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/TimerTest.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/TimerTest.cpp

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

index 2b648f74406afa9916028c3f93d7877430eae827..b3cf96a9a316a318f2b0069e087d7499b9b6b181 100644

--- a/third_party/WebKit/Source/platform/TimerTest.cpp

+++ b/third_party/WebKit/Source/platform/TimerTest.cpp

@@ -21,12 +21,12 @@

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

#include "testing/gtest/include/gtest/gtest.h"

-using testing::ElementsAre;

+using ::testing::ElementsAre;

namespace blink {

namespace {

-class TimerTest : public testing::Test {

+class TimerTest : public ::testing::Test {

public:

void SetUp() override {

run_times_.clear();