Merge page serializers [7/12]

Source/web/web.gypi

 {
   'variables': {
     'web_files': [
       'AssertMatchingEnums.cpp',
       'AssociatedURLLoader.cpp',
       'AssociatedURLLoader.h',
       'ChromeClientImpl.cpp',
       'ChromeClientImpl.h',
       'ColorChooserPopupUIController.cpp',
       'ColorChooserPopupUIController.h',
@@ skipping 279 matching lines @@
       'tests/TextFinderTest.cpp',
       'tests/TopControlsTest.cpp',
       'tests/TouchActionTest.cpp',
       'tests/ViewportTest.cpp',
       'tests/WebDocumentTest.cpp',
       'tests/WebFrameTest.cpp',
       'tests/WebHelperPluginTest.cpp',
       'tests/WebImageTest.cpp',
       'tests/WebInputEventConversionTest.cpp',
       'tests/WebInputEventFactoryTestMac.mm',
-      'tests/WebPageNewSerializerTest.cpp',
       'tests/WebPageSerializerTest.cpp',
       'tests/WebPluginContainerTest.cpp',
       'tests/WebScopedWindowFocusAllowedIndicatorTest.cpp',
       'tests/WebSearchableFormDataTest.cpp',
       'tests/WebSelectorTest.cpp',
       'tests/WebURLRequestTest.cpp',
       'tests/WebURLResponseTest.cpp',
       'tests/WebUnitTests.cpp',
       'tests/WebUserGestureTokenTest.cpp',
       'tests/WebViewTest.cpp',
     ],
     'conditions': [
       ['OS=="win"',
         {
           'web_unittest_files': [
-            'tests/WebPageNewSerializerTest.cpp',
             'tests/WebPageSerializerTest.cpp',
           ],
         }
       ],
       ['OS!="mac"',
         {
           'web_unittest_files': [
             # Mac uses ScrollAnimatorMac instead of ScrollAnimatorNone.
             'tests/ScrollAnimatorNoneTest.cpp',
           ],
         }
       ],
     ],
   },
 }