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

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',
@@ skipping 1143 matching lines @@
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../cc/cc.gyp:cc',
             '../cc/cc.gyp:cc_surfaces',
             '../cc/cc_tests.gyp:cc_test_support',
             '../crypto/crypto.gyp:crypto',
             '../device/battery/battery.gyp:device_battery',
             '../device/battery/battery.gyp:device_battery_mojo_bindings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../gin/gin.gyp:gin',
             '../gpu/gpu.gyp:gpu',
-            '../gpu/gpu.gyp:gpu_ipc_common',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
             '../mojo/mojo_edk.gyp:mojo_common_test_support',
             '../mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
@@ skipping 1071 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }