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

third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp

Index: third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp
diff --git a/third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp b/third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp
index 837461e969f14036aa19da2f4e2427c687445b45..8411ea7f928c8f554014e3af3ba1d4372897408c 100644
--- a/third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp
+++ b/third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp
@@ -39,9 +39,9 @@ class MockFunction : public ScriptFunction {
       : ScriptFunction(script_state) {}
 };
 
-class MockEventListener : public EventListener {
+class MockEventListenerForRemotePlayback : public EventListener {
  public:
-  MockEventListener() : EventListener(kCPPEventListenerType) {}
+  MockEventListenerForRemotePlayback() : EventListener(kCPPEventListenerType) {}
 
   bool operator==(const EventListener& other) const final {
     return this == &other;
@@ -199,9 +199,12 @@ TEST_F(RemotePlaybackTest, StateChangeEvents) {
   RemotePlayback* remote_playback =
       HTMLMediaElementRemotePlayback::remote(*element);
 
-  auto connecting_handler = new ::testing::StrictMock<MockEventListener>();
-  auto connect_handler = new ::testing::StrictMock<MockEventListener>();
-  auto disconnect_handler = new ::testing::StrictMock<MockEventListener>();
+  auto connecting_handler =
+      new ::testing::StrictMock<MockEventListenerForRemotePlayback>();
+  auto connect_handler =
+      new ::testing::StrictMock<MockEventListenerForRemotePlayback>();
+  auto disconnect_handler =
+      new ::testing::StrictMock<MockEventListenerForRemotePlayback>();
 
   remote_playback->addEventListener(EventTypeNames::connecting,
                                     connecting_handler);