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

gpu/gpu.gyp

 # 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.
 
 {
   'variables': {
     'nacl_win64_target': 0,
     'build_angle_deqp_tests%': 0,
   },
   'includes': [
@@ skipping 280 matching lines @@
         ['use_ozone == 1', {
           'sources+': [
            'ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap_unittest.cc',
           ]
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
-      # GN version: //gpu/ipc/service:gpu_ipc_service_unittests
-      'target_name': 'gpu_ipc_service_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../url/url.gyp:url_lib',
-        '../base/base.gyp:base',
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../ipc/ipc.gyp:test_support_ipc',
-        '../testing/gtest.gyp:gtest',
-        'gpu_ipc_service',
-      ],
-      'sources': [
-        'ipc/service/gpu_channel_manager_unittest.cc',
-        'ipc/service/gpu_channel_test_common.cc',
-        'ipc/service/gpu_channel_test_common.h',
-        'ipc/service/gpu_channel_unittest.cc',
-      ],
-      'conditions': [
-        ['OS == "android"', {
-          'sources': [
-            'ipc/service/gpu_memory_buffer_factory_surface_texture_unittest.cc',
-          ],
-        }],
-        ['OS == "mac"', {
-          'sources': [
-            'ipc/service/ca_layer_tree_unittest_mac.mm',
-            'ipc/service/gpu_memory_buffer_factory_io_surface_unittest.cc',
-          ],
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
-              '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
-            ],
-          },
-        }],
-        ['use_ozone == 1', {
-          'sources': [
-            'ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc',
-          ],
-        }],
-      ],
-    },
-    {
       # GN version: //gpu/gpu_perftests
       'target_name': 'gpu_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../testing/perf/perf_test.gyp:perf_test',
         '../ui/gfx/gfx.gyp:gfx_geometry',
@@ skipping 116 matching lines @@
         '..',
       ],
       'sources': [
         'command_buffer/client/gles2_interface_stub.cc',
         'command_buffer/client/gles2_interface_stub.h',
         'command_buffer/service/error_state_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],
     },
     {
-      # GN version: //gpu/ipc/service:test_support
-      'target_name': 'gpu_ipc_service_test_support',
-      'type': 'static_library',
-      'dependencies': [
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'gpu/ipc/service/gpu_memory_buffer_factory_test_template.h',
-      ],
-    },
-    {
       # GN version: //gpu:command_buffer_gles2
       'target_name': 'command_buffer_gles2',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
         '../gpu/gpu.gyp:command_buffer_service',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gl/gl.gyp:gl',
         'gles2_c_lib',
         'gles2_implementation',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         # TODO(hendrikw): Move egl out of gles2_conform_support.
         'gles2_conform_support/egl/config.cc',
         'gles2_conform_support/egl/config.h',
         'gles2_conform_support/egl/display.cc',
         'gles2_conform_support/egl/display.h',
         'gles2_conform_support/egl/egl.cc',
         'gles2_conform_support/egl/surface.cc',
         'gles2_conform_support/egl/surface.h',
         'gles2_conform_support/egl/test_support.cc',
         'gles2_conform_support/egl/test_support.h',
       ],
-          'defines': [
+          'defines': [
         'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
         'EGLAPIENTRY=',
-          ],
+          ],
       'conditions': [
         ['OS=="win"', {
           'defines': [
             'EGLAPI=__declspec(dllexport)',
           ],
         }, { # OS!="win"
-                  'defines': [
+                  'defines': [
             'EGLAPI=__attribute__((visibility(\"default\")))'
           ],
         }],
       ],
     },
     {
       # GN version: //gpu:command_buffer_gles2_tests
       'target_name': 'command_buffer_gles2_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'command_buffer_gles2',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'command_buffer/tests/command_buffer_gles2_tests_main.cc',
         'command_buffer/tests/egl_test.cc',
       ],
-          'defines': [
+          'defines': [
          'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
          'EGLAPIENTRY=',
       ],
       'conditions': [
         ['OS=="win"', {
           'defines': [
             'EGLAPI=__declspec(dllimport)',
           ],
         }, { # OS!="win"
-                  'defines': [
+                  'defines': [
             'EGLAPI=',
           ],
-        }],
+                }],
         ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
   ],
   'conditions': [
     ['component=="static_library"', {
@@ skipping 14 matching lines @@
           'target_name': 'gpu',
           'type': 'none',
           'dependencies': [
             'command_buffer_client',
             'command_buffer_common',
             'command_buffer_service',
             'gles2_cmd_helper',
             'gpu_config',
             'gpu_ipc_client',
             'gpu_ipc_common',
-            'gpu_ipc_service',
           ],
           'sources': [
             'gpu_export.h',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
           # GN version: //gpu/command_buffer/common
           'target_name': 'command_buffer_common',
@@ skipping 76 matching lines @@
         },
         {
           # GN version: //gpu/ipc/common
           'target_name': 'gpu_ipc_common',
           'type': 'static_library',
           'includes': [
             'gpu_ipc_common.gypi',
           ],
           'dependencies': [
             'command_buffer_traits',
-          ],
-        },
-        {
-          # GN version: //gpu/ipc/service
-          'target_name': 'gpu_ipc_service',
-          'type': 'static_library',
-          'includes': [
-            'gpu_ipc_service.gypi',
-          ],
-          'dependencies': [
-            'command_buffer_traits',
           ],
         },
         {
           'target_name': 'gpu_config',
           'type': 'static_library',
           'includes': [
             'gpu_config.gypi',
           ],
         },
       ],
@@ skipping 17 matching lines @@
           'type': 'shared_library',
           'includes': [
             'command_buffer_client.gypi',
             'command_buffer_common.gypi',
             'command_buffer_service.gypi',
             'command_buffer_traits.gypi',
             'gles2_cmd_helper.gypi',
             'gpu_config.gypi',
             'gpu_ipc_client.gypi',
             'gpu_ipc_common.gypi',
-            'gpu_ipc_service.gypi',
             '../build/android/increase_size_for_speed.gypi',
           ],
           'defines': [
             'GPU_IMPLEMENTATION',
           ],
           'sources': [
             'gpu_export.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 53 matching lines @@
           'dependencies': [
             'gpu',
           ],
         },
         {
           # GN version: //gpu/ipc/common
           'target_name': 'gpu_ipc_common',
           'type': 'none',
           'dependencies': [
             'gpu',
-          ],
-        },
-        {
-          # GN version: //gpu/ipc/service
-          'target_name': 'gpu_ipc_service',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
           ],
         },
       ],
     }],
     ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'command_buffer_common_win64',
           'type': 'static_library',
           'variables': {
@@ skipping 292 matching lines @@
             ],
             'sources': [
               'gpu_unittests_apk.isolate',
             ],
           },
         ],
       },
     ],
   ],
 }