Revert of Refactor content/common/gpu into gpu/ipc/service

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
       'test/layouttest_support.cc',
     ],
     'test_support_content_sources': [
       # TODO(phajdan.jr): All of those files should live in content/test (if
       # they're only used by content) or content/public/test (if they're used
       # by other embedders).
       'browser/download/mock_download_file.cc',
       'browser/download/mock_download_file.h',
       'browser/geolocation/fake_access_token_store.cc',
       'browser/geolocation/fake_access_token_store.h',
       'browser/geolocation/mock_location_arbitrator.cc',
       'browser/geolocation/mock_location_arbitrator.h',
       'browser/geolocation/mock_location_provider.cc',
       'browser/geolocation/mock_location_provider.h',
+      'common/gpu/gpu_memory_buffer_factory_test_template.h',
       'public/test/async_file_test_helper.cc',
       'public/test/async_file_test_helper.h',
       'public/test/background_sync_test_util.cc',
       'public/test/background_sync_test_util.h',
       'public/test/content_test_suite_base.cc',
       'public/test/content_test_suite_base.h',
       'public/test/download_test_observer.cc',
       'public/test/download_test_observer.h',
       'public/test/fake_speech_recognition_manager.cc',
       'public/test/fake_speech_recognition_manager.h',
@@ skipping 630 matching lines @@
       'common/cc_messages_unittest.cc',
       'common/common_param_traits_unittest.cc',
       'common/cross_site_document_classifier_unittest.cc',
       'common/cursors/webcursor_unittest.cc',
       'common/database_connections_unittest.cc',
       'common/database_identifier_unittest.cc',
       'common/discardable_shared_memory_heap_unittest.cc',
       'common/dom_storage/dom_storage_map_unittest.cc',
       'common/dwrite_font_platform_win_unittest.cc',
       'common/fileapi/file_system_util_unittest.cc',
+      'common/gpu/ca_layer_tree_unittest_mac.mm',
+      'common/gpu/gpu_channel_manager_unittest.cc',
+      'common/gpu/gpu_channel_test_common.cc',
+      'common/gpu/gpu_channel_test_common.h',
+      'common/gpu/gpu_channel_unittest.cc',
       'common/host_discardable_shared_memory_manager_unittest.cc',
       'common/host_shared_bitmap_manager_unittest.cc',
       'common/indexed_db/indexed_db_key_unittest.cc',
       'common/input/event_with_latency_info_unittest.cc',
       'common/input/gesture_event_stream_validator_unittest.cc',
       'common/input/input_param_traits_unittest.cc',
       'common/input/touch_event_stream_validator_unittest.cc',
       'common/input/web_input_event_traits_unittest.cc',
       'common/inter_process_time_ticks_converter_unittest.cc',
       'common/mac/attributed_string_coder_unittest.mm',
@@ skipping 132 matching lines @@
     'content_unittests_plugin_webrtc_sources': [
       'renderer/media/pepper_to_video_track_adapter_unittest.cc',
       'renderer/media/video_track_to_pepper_adapter_unittest.cc',
     ],
     'content_unittests_android_sources': [
       'browser/android/java/gin_java_method_invocation_helper_unittest.cc',
       'browser/android/java/java_type_unittest.cc',
       'browser/android/java/jni_helper_unittest.cc',
       'browser/android/url_request_content_job_unittest.cc',
       'common/gpu/client/gpu_memory_buffer_impl_surface_texture_unittest.cc',
+      'common/gpu/gpu_memory_buffer_factory_surface_texture_unittest.cc',
       'renderer/java/gin_java_bridge_value_converter_unittest.cc',
       'renderer/media/android/webmediasession_android_unittest.cc',
     ],
+    'content_unittests_mac_sources': [
+      'common/gpu/gpu_memory_buffer_factory_io_surface_unittest.cc',
+    ],
+    'content_unittests_ozone_sources': [
+      'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc',
+    ],
   },
   'targets': [
     {
       # GN version: //content/test:test_support
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
         '../cc/blink/cc_blink.gyp:cc_blink',
         '../cc/cc.gyp:cc',
         '../cc/cc_tests.gyp:cc_test_support',
         '../components/scheduler/scheduler.gyp:scheduler',
         '../components/scheduler/scheduler.gyp:scheduler_test_support',
         '../gpu/blink/gpu_blink.gyp:gpu_blink',
         '../gpu/gpu.gyp:gpu_ipc_common',
-        '../gpu/gpu.gyp:gpu_ipc_service_test_support',
         '../ipc/mojo/ipc_mojo.gyp:*',
         '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../media/midi/midi.gyp:midi',
         '../mojo/mojo_edk.gyp:mojo_common_test_support',
         '../mojo/mojo_base.gyp:mojo_application_base',
         '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../net/net.gyp:net_test_support',
         '../ppapi/ppapi_internal.gyp:ppapi_host',
@@ skipping 353 matching lines @@
           'sources!': [
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
         }],
         ['OS!="win" and OS!="mac"', {
           'sources!': [
             'common/plugin_list_unittest.cc',
           ],
         }],
         ['use_ozone==1', {
+          'sources': [ '<@(content_unittests_ozone_sources)' ],
           'dependencies': [
             '../ui/ozone/ozone.gyp:ozone',
             '../ui/ozone/ozone.gyp:ozone_base',
           ],
         }],
         ['OS == "mac"', {
+          'sources': [ '<@(content_unittests_mac_sources)' ],
           'dependencies': [
             '../third_party/boringssl/boringssl.gyp:boringssl',
           ],
         }],
       ],
     },
     {
       # GN version: //content/test:content_perftests
       'target_name': 'content_perftests',
       'type': '<(gtest_target_type)',
@@ skipping 968 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }