Merge 106394 - Fixed bugs with Pepper 3D under dynamic GPU switching.

content/content_renderer.gypi

 # Copyright (c) 2011 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': [
     '../jingle/jingle.gyp:jingle_glue',
     '../net/net.gyp:net',
     '../ppapi/ppapi_internal.gyp:ppapi_proxy',
     '../skia/skia.gyp:skia',
@@ skipping 89 matching lines @@
     'renderer/media/video_capture_impl_manager.cc',
     'renderer/media/video_capture_impl_manager.h',
     'renderer/media/video_capture_message_filter.cc',
     'renderer/media/video_capture_message_filter.h',
     'renderer/mhtml_generator.cc',
     'renderer/mhtml_generator.h',
     'renderer/notification_provider.cc',
     'renderer/notification_provider.h',
     'renderer/paint_aggregator.cc',
     'renderer/paint_aggregator.h',
+    'renderer/pepper_parent_context_provider.cc',
+    'renderer/pepper_parent_context_provider.h',
     'renderer/pepper_platform_context_3d_impl.cc',
     'renderer/pepper_platform_context_3d_impl.h',
     'renderer/pepper_platform_video_decoder_impl.cc',
     'renderer/pepper_platform_video_decoder_impl.h',
     'renderer/pepper_plugin_delegate_impl.cc',
     'renderer/pepper_plugin_delegate_impl.h',
     'renderer/plugin_channel_host.cc',
     'renderer/plugin_channel_host.h',
     'renderer/render_process.h',
     'renderer/render_process_impl.cc',
@@ skipping 132 matching lines @@
       ],
       'sources': [
         'renderer/media/video_capture_module_impl.cc',
         'renderer/media/video_capture_module_impl.h',
         'renderer/media/webrtc_audio_device_impl.cc',
         'renderer/media/webrtc_audio_device_impl.h',
       ],
     }],
   ],
 }