Merge crbug.com/232556 to M28 branch (1500).

content/content_browser.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': [
     'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
@@ skipping 486 matching lines @@
     'browser/geolocation/win7_location_provider_win.h',
     'browser/gpu/browser_gpu_channel_host_factory.cc',
     'browser/gpu/browser_gpu_channel_host_factory.h',
     'browser/gpu/compositor_util.cc',
     'browser/gpu/gpu_blacklist.cc',
     'browser/gpu/gpu_blacklist.h',
     'browser/gpu/gpu_control_list.cc',
     'browser/gpu/gpu_control_list.h',
     'browser/gpu/gpu_data_manager_impl.cc',
     'browser/gpu/gpu_data_manager_impl.h',
+    'browser/gpu/gpu_data_manager_impl_private.cc',
+    'browser/gpu/gpu_data_manager_impl_private.h',
     'browser/gpu/gpu_driver_bug_list.cc',
     'browser/gpu/gpu_driver_bug_list.h',
     'browser/gpu/gpu_internals_ui.cc',
     'browser/gpu/gpu_internals_ui.h',
     'browser/gpu/gpu_process_host.cc',
     'browser/gpu/gpu_process_host.h',
     'browser/gpu/gpu_process_host_ui_shim.cc',
     'browser/gpu/gpu_process_host_ui_shim.h',
     'browser/gpu/gpu_surface_tracker.cc',
     'browser/gpu/gpu_surface_tracker.h',
@@ skipping 828 matching lines @@
         '../third_party/speex/speex.gyp:libspeex',
       ],
     }],
     ['linux_use_libgps==1', {
       'dependencies': [
         '../build/linux/system.gyp:libgps',
       ],
     }],
   ],
 }