commit adab2337689e8be9e1298ac01278876b3468a823
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 25 18:04:32 2013
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 25 18:04:32 2013
tree 1f0cf6b75255a9dec6e1fff2c3d9429a33f6e0f5
parent e20a6c216c041e057ebccc5974ca9042796ff8a2

Put the pepper files which were moved in r213578 to the content namespace.

I added a "Pepper" prefix to WebPlugin and PluginInstance to avoid collision with the NPAPI versions.

BUG=263054
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/20358002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213657 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/pepper/ppapi_unittest.cc

diff --git a/content/renderer/pepper/ppapi_unittest.cc b/content/renderer/pepper/ppapi_unittest.cc
index e6edf946d..8c8562a 100644
--- a/content/renderer/pepper/ppapi_unittest.cc
+++ b/content/renderer/pepper/ppapi_unittest.cc
@@ -8,16 +8,15 @@
 #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/pepper_plugin_instance_impl.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"
 
-namespace webkit {
-namespace ppapi {
+namespace content {
 
 namespace {
 
@@ -84,13 +83,13 @@
   module_ = new PluginModule("Mock plugin", base::FilePath(),
                              ::ppapi::PpapiPermissions());
   ::ppapi::PpapiGlobals::Get()->ResetMainThreadMessageLoopForTesting();
-  content::PepperPluginInfo::EntryPoints entry_points;
+  PepperPluginInfo::EntryPoints entry_points;
   entry_points.get_interface = &MockGetInterface;
   entry_points.initialize_module = &MockInitializeModule;
   ASSERT_TRUE(module_->InitAsInternalPlugin(entry_points));
 
   // Initialize the mock instance.
-  instance_ = PluginInstanceImpl::Create(
+  instance_ = PepperPluginInstanceImpl::Create(
       delegate_.get(), NULL, module(), NULL, GURL());
 }
 
@@ -165,5 +164,4 @@
   EXPECT_FALSE(result());
 }
 
-}  // namespace ppapi
-}  // namespace webkit
+}  // namespace content