Snapshot of all changes to get jumbo in blink and content.

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

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 3abfda6e02cd3ab7110804c3144a1f423da14a52..8a1de1fb3a1fe396dc8bccaa0634eda6f2c9d81b 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp
@@ -23,9 +23,10 @@
 
 namespace blink {
 
-class MockEventListener : public EventListener {
+class MockEventListenerForPresentationReceiver : public EventListener {
  public:
-  MockEventListener() : EventListener(kCPPEventListenerType) {}
+  MockEventListenerForPresentationReceiver()
+      : EventListener(kCPPEventListenerType) {}
 
   bool operator==(const EventListener& other) const final {
     return this == &other;
@@ -69,7 +70,8 @@ TEST_F(PresentationReceiverTest, NoConnectionUnresolvedConnectionList) {
   V8TestingScope scope;
   auto receiver = new PresentationReceiver(&scope.GetFrame(), nullptr);
 
-  auto event_handler = new StrictMock<MockEventListener>();
+  auto event_handler =
+      new StrictMock<MockEventListenerForPresentationReceiver>();
   AddConnectionavailableEventListener(event_handler, receiver);
   EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);
 
@@ -84,7 +86,8 @@ TEST_F(PresentationReceiverTest, OneConnectionResolvedConnectionListNoEvent) {
   V8TestingScope scope;
   auto receiver = new PresentationReceiver(&scope.GetFrame(), nullptr);
 
-  auto event_handler = new StrictMock<MockEventListener>();
+  auto event_handler =
+      new StrictMock<MockEventListenerForPresentationReceiver>();
   AddConnectionavailableEventListener(event_handler, receiver);
   EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);
 
@@ -103,8 +106,8 @@ TEST_F(PresentationReceiverTest, TwoConnectionsFireOnconnectionavailableEvent) {
   V8TestingScope scope;
   auto receiver = new PresentationReceiver(&scope.GetFrame(), nullptr);
 
-  StrictMock<MockEventListener>* event_handler =
-      new StrictMock<MockEventListener>();
+  StrictMock<MockEventListenerForPresentationReceiver>* event_handler =
+      new StrictMock<MockEventListenerForPresentationReceiver>();
   AddConnectionavailableEventListener(event_handler, receiver);
   EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(1);
 
@@ -124,8 +127,8 @@ TEST_F(PresentationReceiverTest, TwoConnectionsNoEvent) {
   V8TestingScope scope;
   auto receiver = new PresentationReceiver(&scope.GetFrame(), nullptr);
 
-  StrictMock<MockEventListener>* event_handler =
-      new StrictMock<MockEventListener>();
+  StrictMock<MockEventListenerForPresentationReceiver>* event_handler =
+      new StrictMock<MockEventListenerForPresentationReceiver>();
   AddConnectionavailableEventListener(event_handler, receiver);
   EXPECT_CALL(*event_handler, handleEvent(::testing::_, ::testing::_)).Times(0);