Move webkit/plugins/ppapi to content/renderer/pepper.

content/content_tests.gypi

Index: content/content_tests.gypi
===================================================================
--- content/content_tests.gypi	(revision 213561)
+++ content/content_tests.gypi	(working copy)
@@ -430,10 +430,21 @@
         'renderer/media/video_capture_message_filter_unittest.cc',
         'renderer/media/webaudiosourceprovider_impl_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
-        'renderer/skia_benchmarking_extension_unittest.cc',
+        'renderer/pepper/host_var_tracker_unittest.cc',
+        'renderer/pepper/mock_platform_image_2d.cc',
+        'renderer/pepper/mock_platform_image_2d.h',
+        'renderer/pepper/mock_plugin_delegate.cc',
+        'renderer/pepper/mock_plugin_delegate.h',
+        'renderer/pepper/mock_resource.h',
+        'renderer/pepper/ppapi_plugin_instance_unittest.cc',
+        'renderer/pepper/ppapi_unittest.cc',
+        'renderer/pepper/ppapi_unittest.h',
+        'renderer/pepper/quota_file_io_unittest.cc',
+        'renderer/pepper/v8_var_converter_unittest.cc',
         'renderer/pepper/pepper_broker_impl_unittest.cc',
         'renderer/render_thread_impl_unittest.cc',
         'renderer/render_view_impl_unittest.cc',
+        'renderer/skia_benchmarking_extension_unittest.cc',
         'renderer/v8_value_converter_impl_unittest.cc',
         'renderer/webplugin_impl_unittest.cc',
         'test/image_decoder_test.cc',
@@ -531,17 +542,6 @@
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
         '../webkit/common/user_agent/user_agent_unittest.cc',
-        '../webkit/plugins/ppapi/host_var_tracker_unittest.cc',
-        '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
-        '../webkit/plugins/ppapi/mock_platform_image_2d.h',
-        '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
-        '../webkit/plugins/ppapi/mock_plugin_delegate.h',
-        '../webkit/plugins/ppapi/mock_resource.h',
-        '../webkit/plugins/ppapi/ppapi_plugin_instance_unittest.cc',
-        '../webkit/plugins/ppapi/ppapi_unittest.cc',
-        '../webkit/plugins/ppapi/ppapi_unittest.h',
-        '../webkit/plugins/ppapi/quota_file_io_unittest.cc',
-        '../webkit/plugins/ppapi/v8_var_converter_unittest.cc',
         '../webkit/browser/quota/mock_quota_manager.cc',
         '../webkit/browser/quota/mock_quota_manager.h',
         '../webkit/browser/quota/mock_quota_manager_unittest.cc',
@@ -848,6 +848,10 @@
             'renderer/dom_serializer_browsertest.cc',
             'renderer/mouse_lock_dispatcher_browsertest.cc',
             'renderer/password_form_conversion_utils_browsertest.cc',
+            'renderer/pepper/mock_platform_image_2d.cc',
+            'renderer/pepper/mock_platform_image_2d.h',
+            'renderer/pepper/mock_plugin_delegate.cc',
+            'renderer/pepper/mock_plugin_delegate.h',
             'renderer/pepper/mock_renderer_ppapi_host.cc',
             'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc',
             'renderer/pepper/pepper_file_chooser_host_unittest.cc',
@@ -868,10 +872,6 @@
             'test/content_browser_test_utils_mac.mm',
             'test/content_browser_test_test.cc',
             'test/content_test_launcher.cc',
-            '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
-            '../webkit/plugins/ppapi/mock_platform_image_2d.h',
-            '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
-            '../webkit/plugins/ppapi/mock_plugin_delegate.h',
             '../webkit/renderer/cpp_binding_example.cc',
             '../webkit/renderer/cpp_binding_example.h',
           ],
@@ -969,12 +969,12 @@
               ],
             }],
             ['enable_plugins==0', {
+              'sources/': [
+                ['exclude', '^renderer/pepper/'],
+              ],
               'sources!': [
                 'browser/plugin_service_impl_browsertest.cc',
                 'browser/plugin_data_remover_impl_browsertest.cc',
-                'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc',
-                'renderer/pepper/pepper_file_chooser_host_unittest.cc',
-                'renderer/pepper/pepper_graphics_2d_host_unittest.cc',
               ],
             }],
             ['enable_pepper_cdms==1', {