Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats

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,
   },
   'includes': [
     'gpu_common.gypi',
@@ skipping 505 matching lines @@
           # GN version: //gpu
           'target_name': 'gpu',
           'type': 'none',
           'dependencies': [
             'command_buffer_client',
             'command_buffer_common',
             'command_buffer_service',
             'gles2_cmd_helper',
             'gpu_config',
             'gpu_ipc',
-            'gpu_ipc_common',
           ],
           '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 60 matching lines @@
           'target_name': 'gpu_ipc',
           'type': 'static_library',
           'includes': [
             'gpu_ipc.gypi',
           ],
           'dependencies': [
             'command_buffer_common',
           ],
         },
         {
-          # GN version: //gpu/ipc/common
-          'target_name': 'gpu_ipc_common',
-          'type': 'static_library',
-          'includes': [
-            'gpu_ipc_common.gypi',
-          ],
-        },
-        {
           'target_name': 'gpu_config',
           'type': 'static_library',
           'includes': [
             'gpu_config.gypi',
           ],
         },
       ],
     },
     { # component != static_library
       'targets': [
@@ skipping 12 matching lines @@
           # GN version: //gpu
           'target_name': 'gpu',
           'type': 'shared_library',
           'includes': [
             'command_buffer_client.gypi',
             'command_buffer_common.gypi',
             'command_buffer_service.gypi',
             'gles2_cmd_helper.gypi',
             'gpu_config.gypi',
             'gpu_ipc.gypi',
-            'gpu_ipc_common.gypi',
             '../build/android/increase_size_for_speed.gypi',
           ],
           'defines': [
             'GPU_IMPLEMENTATION',
           ],
           'sources': [
             'gpu_export.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 37 matching lines @@
           'dependencies': [
             'gpu',
           ],
         },
         {
           # GN version: //gpu/ipc
           'target_name': 'gpu_ipc',
           'type': 'none',
           'dependencies': [
             'gpu',
-          ],
-        },
-        {
-          # GN version: //gpu/ipc/common
-          'target_name': 'gpu_ipc_common',
-          '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 19 matching lines @@
           'target_name': 'gpu_ipc_win64',
           'type': 'static_library',
           'variables': {
             'nacl_win64_target': 1,
           },
           'includes': [
             'gpu_ipc.gypi',
           ],
           'dependencies': [
             '../base/base.gyp:base_win64',
-            '../ipc/ipc.gyp:ipc_win64',
-            'command_buffer_common_win64',
-          ],
-          'defines': [
-            '<@(nacl_win64_defines)',
-            'GPU_IMPLEMENTATION',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-        },
-        {
-          'target_name': 'gpu_ipc_common_win64',
-          'type': 'static_library',
-          'variables': {
-            'nacl_win64_target': 1,
-          },
-          'includes': [
-            'gpu_ipc_common.gypi',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base_win64',
             '../ipc/ipc.gyp:ipc_win64',
             'command_buffer_common_win64',
           ],
           'defines': [
             '<@(nacl_win64_defines)',
             'GPU_IMPLEMENTATION',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
@@ skipping 228 matching lines @@
             ],
             'sources': [
               'gpu_unittests_apk.isolate',
             ],
           },
         ],
       },
     ],
   ],
 }