Merge MediaControlsChromium into MediaControls (2nd try)

Source/core/core.gypi

 {
     'variables': {
         # Files for which bindings (.cpp and .h files) will be generated
         'core_idl_files': [
             'animation/Animation.idl',
             'animation/Player.idl',
             'animation/TimedItem.idl',
             'clipboard/Clipboard.idl',
             'clipboard/DataTransferItem.idl',
             'clipboard/DataTransferItemList.idl',
@@ skipping 2654 matching lines @@
             'html/shadow/DateTimeNumericFieldElement.cpp',
             'html/shadow/DateTimeNumericFieldElement.h',
             'html/shadow/DateTimeSymbolicFieldElement.cpp',
             'html/shadow/DateTimeSymbolicFieldElement.h',
             'html/shadow/DetailsMarkerControl.cpp',
             'html/shadow/DetailsMarkerControl.h',
             'html/shadow/HTMLContentElement.cpp',
             'html/shadow/HTMLContentElement.h',
             'html/shadow/HTMLShadowElement.cpp',
             'html/shadow/HTMLShadowElement.h',
-            'html/shadow/MediaControls.cpp',
-            'html/shadow/MediaControls.h',
             'html/shadow/MediaControlElementTypes.cpp',
             'html/shadow/MediaControlElementTypes.h',
             'html/shadow/MediaControlElements.cpp',
             'html/shadow/MediaControlElements.h',
-            'html/shadow/MediaControlsChromium.cpp',
-            'html/shadow/MediaControlsChromium.h',
+            'html/shadow/MediaControls.cpp',
+            'html/shadow/MediaControls.h',
             'html/shadow/MediaControlsChromiumAndroid.cpp',
             'html/shadow/MediaControlsChromiumAndroid.h',
             'html/shadow/MeterShadowElement.cpp',
             'html/shadow/MeterShadowElement.h',
             'html/shadow/PasswordGeneratorButtonElement.cpp',
             'html/shadow/PasswordGeneratorButtonElement.h',
             'html/shadow/ProgressShadowElement.cpp',
             'html/shadow/ProgressShadowElement.h',
             'html/shadow/ShadowElementNames.cpp',
             'html/shadow/ShadowElementNames.h',
@@ skipping 587 matching lines @@
             'html/parser/HTMLParserThreadTest.cpp',
             'html/track/vtt/BufferedLineReaderTest.cpp',
             'html/track/vtt/VTTScannerTest.cpp',
             'rendering/RenderOverflowTest.cpp',
             'rendering/shapes/BoxShapeTest.cpp',
             'testing/UnitTestHelpers.cpp',
             'testing/UnitTestHelpers.h',
         ],
     }
 }