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

content/content_common.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',
     '../cc/cc.gyp:cc',
     '../components/tracing.gyp:tracing',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
     '../gpu/blink/gpu_blink.gyp:gpu_blink',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../gpu/gpu.gyp:command_buffer_service',
     '../gpu/gpu.gyp:gles2_c_lib',
     '../gpu/gpu.gyp:gles2_implementation',
     # TODO: the dependency on gl_in_process_context should be decoupled from
     # content and moved to android_webview. See crbug.com/365797.
     '../gpu/gpu.gyp:gl_in_process_context',
     '../gpu/gpu.gyp:gpu_ipc',
-    '../gpu/gpu.gyp:gpu_ipc_common',
     '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
     '../ipc/ipc.gyp:ipc',
     '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
     '../media/media.gyp:media',
     '../media/media.gyp:shared_memory_support',
     '../media/midi/midi.gyp:midi',
     '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
     '../mojo/mojo_edk.gyp:mojo_system_impl',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ skipping 93 matching lines @@
       'public/common/favicon_url.cc',
       'public/common/favicon_url.h',
       'public/common/file_chooser_file_info.cc',
       'public/common/file_chooser_file_info.h',
       'public/common/file_chooser_params.cc',
       'public/common/file_chooser_params.h',
       'public/common/frame_navigate_params.cc',
       'public/common/frame_navigate_params.h',
       'public/common/geoposition.cc',
       'public/common/geoposition.h',
+      'public/common/gpu_memory_stats.cc',
+      'public/common/gpu_memory_stats.h',
       'public/common/injection_test_mac.h',
       'public/common/injection_test_win.h',
       'public/common/javascript_message_type.h',
       'public/common/main_function_params.h',
       'public/common/manifest.cc',
       'public/common/manifest.h',
       'public/common/media_metadata.cc',
       'public/common/media_metadata.h',
       'public/common/media_stream_request.cc',
       'public/common/media_stream_request.h',
@@ skipping 940 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }