Consolidate OutputSurface constructors into GL vs Vulkan.

content/content_renderer.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_proto',
@@ skipping 198 matching lines @@
       'renderer/frame_blame_context.h',
       'renderer/gamepad_shared_memory_reader.cc',
       'renderer/gamepad_shared_memory_reader.h',
       'renderer/gpu/compositor_dependencies.h',
       'renderer/gpu/compositor_external_begin_frame_source.cc',
       'renderer/gpu/compositor_external_begin_frame_source.h',
       'renderer/gpu/compositor_forwarding_message_filter.cc',
       'renderer/gpu/compositor_forwarding_message_filter.h',
       'renderer/gpu/compositor_output_surface.cc',
       'renderer/gpu/compositor_output_surface.h',
-      'renderer/gpu/delegated_compositor_output_surface.cc',
-      'renderer/gpu/delegated_compositor_output_surface.h',
       'renderer/gpu/frame_swap_message_queue.cc',
       'renderer/gpu/frame_swap_message_queue.h',
       'renderer/gpu/gpu_benchmarking_extension.cc',
       'renderer/gpu/gpu_benchmarking_extension.h',
       'renderer/gpu/mailbox_output_surface.cc',
       'renderer/gpu/mailbox_output_surface.h',
       'renderer/gpu/queue_message_swap_promise.cc',
       'renderer/gpu/queue_message_swap_promise.h',
       'renderer/gpu/render_widget_compositor.cc',
       'renderer/gpu/render_widget_compositor.h',
@@ skipping 678 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }