third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp - Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.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

« no previous file with comments | « third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp ('k') | third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp

diff --git a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp

index 17d4c8cdf6b6b9eac634b50a46b9ac2b35f7cb46..3abfda6e02cd3ab7110804c3144a1f423da14a52 100644

--- a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp

+++ b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp

@@ -71,7 +71,7 @@ TEST_F(PresentationReceiverTest, NoConnectionUnresolvedConnectionList) {

auto event_handler = new StrictMock<MockEventListener>();

AddConnectionavailableEventListener(event_handler, receiver);

- EXPECT_CALL(*event_handler, handleEvent(testing::_, testing::_)).Times(0);

+ EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);

receiver->connectionList(scope.GetScriptState());

@@ -86,7 +86,7 @@ TEST_F(PresentationReceiverTest, OneConnectionResolvedConnectionListNoEvent) {

auto event_handler = new StrictMock<MockEventListener>();

AddConnectionavailableEventListener(event_handler, receiver);

- EXPECT_CALL(*event_handler, handleEvent(testing::_, testing::_)).Times(0);

+ EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);

receiver->connectionList(scope.GetScriptState());

@@ -106,7 +106,7 @@ TEST_F(PresentationReceiverTest, TwoConnectionsFireOnconnectionavailableEvent) {

StrictMock<MockEventListener>* event_handler =

new StrictMock<MockEventListener>();

AddConnectionavailableEventListener(event_handler, receiver);

- EXPECT_CALL(*event_handler, handleEvent(testing::_, testing::_)).Times(1);

+ EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(1);

receiver->connectionList(scope.GetScriptState());

@@ -127,7 +127,7 @@ TEST_F(PresentationReceiverTest, TwoConnectionsNoEvent) {

StrictMock<MockEventListener>* event_handler =

new StrictMock<MockEventListener>();

AddConnectionavailableEventListener(event_handler, receiver);

- EXPECT_CALL(*event_handler, handleEvent(testing::_, testing::_)).Times(0);

+ EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);

WebPresentationInfo presentation_info(KURL(NullURL(), "http://example.com"),

"id");

@@ -149,7 +149,7 @@ TEST_F(PresentationReceiverTest, TwoConnectionsNoEvent) {

TEST_F(PresentationReceiverTest, CreateReceiver) {

MockWebPresentationClient client;

- EXPECT_CALL(client, SetReceiver(testing::_));

+ EXPECT_CALL(client, SetReceiver(::testing::_));

V8TestingScope scope;

new PresentationReceiver(&scope.GetFrame(), &client);