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

gpu/gpu.gyp

Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 8d5343f9ce341135af8636a5109442e2a2e0b259..2ad775d2c6e601c5e106b6d2941a710e54ecec28 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -523,7 +523,6 @@
             'gles2_cmd_helper',
             'gpu_config',
             'gpu_ipc',
-            'gpu_ipc_common',
           ],
           'sources': [
             'gpu_export.h',
@@ -601,14 +600,6 @@
           ],
           'dependencies': [
             'command_buffer_common',
-          ],
-        },
-        {
-          # GN version: //gpu/ipc/common
-          'target_name': 'gpu_ipc_common',
-          'type': 'static_library',
-          'includes': [
-            'gpu_ipc_common.gypi',
           ],
         },
         {
@@ -644,7 +635,6 @@
             'gles2_cmd_helper.gypi',
             'gpu_config.gypi',
             'gpu_ipc.gypi',
-            'gpu_ipc_common.gypi',
             '../build/android/increase_size_for_speed.gypi',
           ],
           'defines': [
@@ -699,14 +689,6 @@
         {
           # 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',
@@ -746,30 +728,6 @@
           },
           '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',