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

content/renderer/pepper/ppapi_unittest.cc

Index: content/renderer/pepper/ppapi_unittest.cc
===================================================================
--- content/renderer/pepper/ppapi_unittest.cc	(revision 213482)
+++ content/renderer/pepper/ppapi_unittest.cc	(working copy)
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/ppapi/ppapi_unittest.h"
+#include "content/renderer/pepper/ppapi_unittest.h"
 
 #include "base/message_loop/message_loop.h"
+#include "content/renderer/pepper/gfx_conversion.h"
+#include "content/renderer/pepper/host_globals.h"
+#include "content/renderer/pepper/mock_plugin_delegate.h"
+#include "content/renderer/pepper/plugin_module.h"
+#include "content/renderer/pepper/ppapi_interface_factory.h"
+#include "content/renderer/pepper/ppapi_plugin_instance_impl.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
-#include "webkit/plugins/ppapi/gfx_conversion.h"
-#include "webkit/plugins/ppapi/host_globals.h"
-#include "webkit/plugins/ppapi/mock_plugin_delegate.h"
-#include "webkit/plugins/ppapi/plugin_module.h"
-#include "webkit/plugins/ppapi/ppapi_interface_factory.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
 
 namespace webkit {
 namespace ppapi {
@@ -81,10 +81,10 @@
   delegate_.reset(NewPluginDelegate());
 
   // Initialize the mock module.
-  module_ = new PluginModule("Mock plugin", base::FilePath(), this,
+  module_ = new PluginModule("Mock plugin", base::FilePath(),
                              ::ppapi::PpapiPermissions());
   ::ppapi::PpapiGlobals::Get()->ResetMainThreadMessageLoopForTesting();
-  PluginModule::EntryPoints entry_points;
+  content::PepperPluginInfo::EntryPoints entry_points;
   entry_points.get_interface = &MockGetInterface;
   entry_points.initialize_module = &MockInitializeModule;
   ASSERT_TRUE(module_->InitAsInternalPlugin(entry_points));
@@ -123,10 +123,6 @@
   instance_->view_data_.clip_rect = instance_->view_data_.rect;
 }
 
-void PpapiUnittest::PluginModuleDead(PluginModule* /* dead_module */) {
-  // Nothing needed (this is necessary to make the module compile).
-}
-
 // Tests whether custom PPAPI interface factories are called when PPAPI
 // interfaces are requested.
 class PpapiCustomInterfaceFactoryTest : public PpapiUnittest {