Put the Pepper stuff in the content namespace.

Review URL: https://chromiumcodereview.appspot.com/9959037

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

24 files changed, 121 insertions, 40 deletions

diff --git a/content/renderer/pepper/pepper_broker_impl.cc b/content/renderer/pepper/pepper_broker_impl.cc
index e3781d8..94b88a4 100644
--- a/content/renderer/pepper/pepper_broker_impl.cc
+++ b/content/renderer/pepper/pepper_broker_impl.cc
@@ -19,6 +19,8 @@
 #include <windows.h>
 #endif
 
+namespace content {
+
 namespace {
 
 base::SyncSocket::Handle DuplicateHandle(base::SyncSocket::Handle handle) {
@@ -247,3 +249,4 @@ void PepperBrokerImpl::ConnectPluginToBroker(
   client->BrokerConnected(ppapi::PlatformFileToInt(plugin_handle), result);
 }
 
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_broker_impl.h b/content/renderer/pepper/pepper_broker_impl.h
index 70c6f23..cbed850 100644
--- a/content/renderer/pepper/pepper_broker_impl.h
+++ b/content/renderer/pepper/pepper_broker_impl.h
@@ -11,8 +11,6 @@
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 
-class PepperPluginDelegateImpl;
-
 namespace IPC {
 struct ChannelHandle;
 }
@@ -29,6 +27,10 @@ class PluginModule;
 }
 }
 
+namespace content {
+
+class PepperPluginDelegateImpl;
+
 // This object is NOT thread-safe.
 class CONTENT_EXPORT PepperBrokerDispatcherWrapper {
  public:
@@ -90,4 +92,6 @@ class PepperBrokerImpl : public webkit::ppapi::PluginDelegate::Broker,
   DISALLOW_COPY_AND_ASSIGN(PepperBrokerImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_
diff --git a/content/renderer/pepper/pepper_broker_impl_unittest.cc b/content/renderer/pepper/pepper_broker_impl_unittest.cc
index 5a36f24..b3148cc 100644
--- a/content/renderer/pepper/pepper_broker_impl_unittest.cc
+++ b/content/renderer/pepper/pepper_broker_impl_unittest.cc
@@ -12,6 +12,8 @@
 #include "content/test/mock_render_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace content {
+
 class PepperBrokerImplTest : public ::testing::Test {
  protected:
   MessageLoopForIO message_loop_;
@@ -56,3 +58,5 @@ TEST_F(PepperBrokerImplTest, InitSuccess) {
   EXPECT_EQ(0, ::close(fds[0]));
 #endif  // defined(OS_POSIX));
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
index 5ff77ef..d5a1d20 100644
--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
@@ -7,6 +7,8 @@
 #include "base/logging.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 
+namespace content {
+
 namespace {
 
 ppapi::DeviceRefData FromStreamDeviceInfo(
@@ -92,14 +94,14 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
     PP_DeviceType_Dev type) {
   switch (type) {
     case PP_DEVICETYPE_DEV_INVALID:
-      return content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+      return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
     case PP_DEVICETYPE_DEV_AUDIOCAPTURE:
-      return content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+      return MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
     case PP_DEVICETYPE_DEV_VIDEOCAPTURE:
-      return content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+      return MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
     default:
       NOTREACHED();
-      return content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+      return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
   }
 }
 
@@ -107,11 +109,11 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
 PP_DeviceType_Dev PepperDeviceEnumerationEventHandler::FromMediaStreamType(
     media_stream::MediaStreamType type) {
   switch (type) {
-    case content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:
+    case MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:
       return PP_DEVICETYPE_DEV_INVALID;
-    case content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:
+    case MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:
       return PP_DEVICETYPE_DEV_AUDIOCAPTURE;
-    case content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
+    case MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
       return PP_DEVICETYPE_DEV_VIDEOCAPTURE;
     default:
       NOTREACHED();
@@ -159,3 +161,5 @@ void PepperDeviceEnumerationEventHandler::NotifyDeviceOpened(
 
   callback.Run(request_id, succeeded, label);
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_device_enumeration_event_handler.h b/content/renderer/pepper/pepper_device_enumeration_event_handler.h
index 3712b94..e43a151 100644
--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.h
+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.h
@@ -12,6 +12,8 @@
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
+namespace content {
+
 class PepperDeviceEnumerationEventHandler
     : public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<PepperDeviceEnumerationEventHandler> {
@@ -76,4 +78,6 @@ class PepperDeviceEnumerationEventHandler
   DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationEventHandler);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_
diff --git a/content/renderer/pepper/pepper_parent_context_provider.cc b/content/renderer/pepper/pepper_parent_context_provider.cc
index 90c7383..9cb7a1f 100644
--- a/content/renderer/pepper/pepper_parent_context_provider.cc
+++ b/content/renderer/pepper/pepper_parent_context_provider.cc
@@ -4,8 +4,12 @@
 
 #include "content/renderer/pepper/pepper_parent_context_provider.h"
 
+namespace content {
+
 PepperParentContextProvider::PepperParentContextProvider() {
 }
 
 PepperParentContextProvider::~PepperParentContextProvider() {
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_parent_context_provider.h b/content/renderer/pepper/pepper_parent_context_provider.h
index d4f0255..48243d8 100644
--- a/content/renderer/pepper/pepper_parent_context_provider.h
+++ b/content/renderer/pepper/pepper_parent_context_provider.h
@@ -10,6 +10,8 @@
 
 class WebGraphicsContext3DCommandBufferImpl;
 
+namespace content {
+
 // Defines the mechanism by which a Pepper 3D context fetches its
 // parent context for display to the screen.
 class PepperParentContextProvider {
@@ -25,4 +27,6 @@ class PepperParentContextProvider {
   DISALLOW_COPY_AND_ASSIGN(PepperParentContextProvider);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PARENT_CONTEXT_PROVIDER_H_
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
index 3ac06f2..c69d562 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
@@ -14,6 +14,8 @@
 #include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_manager_base.h"
 
+namespace content {
+
 PepperPlatformAudioInputImpl::PepperPlatformAudioInputImpl()
     : client_(NULL),
       stream_id_(0),
@@ -274,3 +276,5 @@ void PepperPlatformAudioInputImpl::NotifyStreamCreationFailed() {
   if (client_)
     client_->StreamCreationFailed();
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.h b/content/renderer/pepper/pepper_platform_audio_input_impl.h
index 384a7c6..4117fe4 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.h
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.h
@@ -19,6 +19,8 @@ namespace media {
 class AudioParameters;
 }
 
+namespace content {
+
 class PepperPluginDelegateImpl;
 
 // PepperPlatformAudioInputImpl is operated on two threads: the main thread (the
@@ -111,4 +113,6 @@ class PepperPlatformAudioInputImpl
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioInputImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_INPUT_IMPL_H_
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
index bab8322..84ae082 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
@@ -13,6 +13,8 @@
 #include "content/renderer/media/audio_hardware.h"
 #include "content/renderer/render_thread_impl.h"
 
+namespace content {
+
 PepperPlatformAudioOutputImpl::PepperPlatformAudioOutputImpl()
     : client_(NULL),
       stream_id_(0),
@@ -161,3 +163,5 @@ void PepperPlatformAudioOutputImpl::OnStreamCreated(
                    handle, socket_handle, length));
   }
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.h b/content/renderer/pepper/pepper_platform_audio_output_impl.h
index b1609ef..6ad8b80 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.h
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.h
@@ -18,6 +18,8 @@ namespace base {
 class MessageLoopProxy;
 }
 
+namespace content {
+
 class PepperPlatformAudioOutputImpl
     : public webkit::ppapi::PluginDelegate::PlatformAudioOutput,
       public AudioMessageFilter::Delegate,
@@ -74,4 +76,6 @@ class PepperPlatformAudioOutputImpl
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutputImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_
diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc
index 2abd9b1..d0cc174 100644
--- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc
+++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc
@@ -18,6 +18,8 @@
 
 #ifdef ENABLE_GPU
 
+namespace content {
+
 PlatformContext3DImpl::PlatformContext3DImpl(
     PepperParentContextProvider* parent_context_provider)
       : parent_context_provider_(parent_context_provider),
@@ -67,7 +69,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list) {
   // Note similar code in PP_GRAPHICS3DATTRIB_initialize.
   do {
     channel_ = render_thread->EstablishGpuChannelSync(
-        content::CAUSE_FOR_GPU_LAUNCH_PEPPERPLATFORMCONTEXT3DIMPL_INITIALIZE);
+        CAUSE_FOR_GPU_LAUNCH_PEPPERPLATFORMCONTEXT3DIMPL_INITIALIZE);
     if (!channel_.get())
       return false;
     DCHECK(channel_->state() == GpuChannelHost::kConnected);
@@ -201,4 +203,6 @@ void PlatformContext3DImpl::OnConsoleMessage(const std::string& msg, int id) {
     console_message_callback_.Run(msg, id);
 }
 
+}  // namespace content
+
 #endif  // ENABLE_GPU
diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.h b/content/renderer/pepper/pepper_platform_context_3d_impl.h
index 9180d40..59fa85e 100644
--- a/content/renderer/pepper/pepper_platform_context_3d_impl.h
+++ b/content/renderer/pepper/pepper_platform_context_3d_impl.h
@@ -22,9 +22,12 @@ class CommandBuffer;
 
 class CommandBufferProxy;
 class GpuChannelHost;
-class PepperParentContextProvider;
 class ContentGLContext;
 
+namespace content {
+
+class PepperParentContextProvider;
+
 class PlatformContext3DImpl
     : public webkit::ppapi::PluginDelegate::PlatformContext3D {
  public:
@@ -59,6 +62,8 @@ class PlatformContext3DImpl
   base::WeakPtrFactory<PlatformContext3DImpl> weak_ptr_factory_;
 };
 
+}  // namespace content
+
 #endif  // ENABLE_GPU
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_IMPL_H_
diff --git a/content/renderer/pepper/pepper_platform_image_2d_impl.cc b/content/renderer/pepper/pepper_platform_image_2d_impl.cc
index bf02e79..a609ae8 100644
--- a/content/renderer/pepper/pepper_platform_image_2d_impl.cc
+++ b/content/renderer/pepper/pepper_platform_image_2d_impl.cc
@@ -9,6 +9,8 @@
 #include "content/renderer/render_thread_impl.h"
 #include "ui/gfx/surface/transport_dib.h"
 
+namespace content {
+
 PepperPlatformImage2DImpl::PepperPlatformImage2DImpl(int width,
                                                      int height,
                                                      TransportDIB* dib)
@@ -80,3 +82,5 @@ intptr_t PepperPlatformImage2DImpl::GetSharedMemoryHandle(
 TransportDIB* PepperPlatformImage2DImpl::GetTransportDIB() const {
   return dib_.get();
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_platform_image_2d_impl.h b/content/renderer/pepper/pepper_platform_image_2d_impl.h
index 333ee01c..851689a 100644
--- a/content/renderer/pepper/pepper_platform_image_2d_impl.h
+++ b/content/renderer/pepper/pepper_platform_image_2d_impl.h
@@ -8,6 +8,8 @@
 #include "base/basictypes.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
+namespace content {
+
 // Implements the Image2D using a TransportDIB.
 class PepperPlatformImage2DImpl
     : public webkit::ppapi::PluginDelegate::PlatformImage2D {
@@ -36,4 +38,6 @@ class PepperPlatformImage2DImpl
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformImage2DImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_IMAGE_2D_IMPL_H_
diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.cc b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
index 7d20d5e..9a6ea45 100644
--- a/content/renderer/pepper/pepper_platform_video_capture_impl.cc
+++ b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
@@ -12,6 +12,8 @@
 #include "content/renderer/render_thread_impl.h"
 #include "media/video/capture/video_capture_proxy.h"
 
+namespace content {
+
 PepperPlatformVideoCaptureImpl::PepperPlatformVideoCaptureImpl(
     const base::WeakPtr<PepperPluginDelegateImpl>& plugin_delegate,
     const std::string& device_id,
@@ -173,3 +175,5 @@ void PepperPlatformVideoCaptureImpl::OnDeviceOpened(int request_id,
   if (handler_)
     handler_->OnInitialized(this, succeeded);
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.h b/content/renderer/pepper/pepper_platform_video_capture_impl.h
index 07fd275..9eb7504 100644
--- a/content/renderer/pepper/pepper_platform_video_capture_impl.h
+++ b/content/renderer/pepper/pepper_platform_video_capture_impl.h
@@ -15,12 +15,14 @@
 #include "media/video/capture/video_capture.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
-class PepperPluginDelegateImpl;
-
 namespace media {
 class VideoCaptureHandlerProxy;
 }
 
+namespace content {
+
+class PepperPluginDelegateImpl;
+
 class PepperPlatformVideoCaptureImpl
     : public webkit::ppapi::PluginDelegate::PlatformVideoCapture,
       public media::VideoCapture::EventHandler {
@@ -80,4 +82,6 @@ class PepperPlatformVideoCaptureImpl
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformVideoCaptureImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_VIDEO_CAPTURE_IMPL_H_
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index 770c756..80e15d7 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -91,6 +91,8 @@
 using WebKit::WebView;
 using WebKit::WebFrame;
 
+namespace content {
+
 namespace {
 
 class HostDispatcherWrapper
@@ -189,7 +191,7 @@ class PluginInstanceLockTarget : public MouseLockDispatcher::LockTarget {
 }  // namespace
 
 PepperPluginDelegateImpl::PepperPluginDelegateImpl(RenderViewImpl* render_view)
-    : content::RenderViewObserver(render_view),
+    : RenderViewObserver(render_view),
       render_view_(render_view),
       has_saved_context_menu_action_(false),
       saved_context_menu_action_(0),
@@ -219,7 +221,7 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
   // In-process plugins will have always been created up-front to avoid the
   // sandbox restrictions. So getting here implies it doesn't exist or should
   // be out of process.
-  const content::PepperPluginInfo* info =
+  const PepperPluginInfo* info =
       PepperPluginRegistry::GetInstance()->GetInfoForPlugin(webplugin_info);
   if (!info) {
     *pepper_plugin_was_registered = false;
@@ -536,7 +538,7 @@ void PepperPluginDelegateImpl::InstanceDeleted(
 }
 
 SkBitmap* PepperPluginDelegateImpl::GetSadPluginBitmap() {
-  return content::GetContentClient()->renderer()->GetSadPluginBitmap();
+  return GetContentClient()->renderer()->GetSadPluginBitmap();
 }
 
 webkit::ppapi::PluginDelegate::PlatformImage2D*
@@ -1091,7 +1093,7 @@ void PepperPluginDelegateImpl::UnregisterHostResolver(uint32 host_resolver_id) {
 bool PepperPluginDelegateImpl::AddNetworkListObserver(
     webkit_glue::NetworkListObserver* observer) {
 #if defined(ENABLE_P2P_APIS)
-  content::P2PSocketDispatcher* socket_dispatcher =
+  P2PSocketDispatcher* socket_dispatcher =
       render_view_->p2p_socket_dispatcher();
   if (!socket_dispatcher) {
     return false;
@@ -1106,7 +1108,7 @@ bool PepperPluginDelegateImpl::AddNetworkListObserver(
 void PepperPluginDelegateImpl::RemoveNetworkListObserver(
     webkit_glue::NetworkListObserver* observer) {
 #if defined(ENABLE_P2P_APIS)
-  content::P2PSocketDispatcher* socket_dispatcher =
+  P2PSocketDispatcher* socket_dispatcher =
       render_view_->p2p_socket_dispatcher();
   if (socket_dispatcher)
     socket_dispatcher->RemoveNetworkListObserver(observer);
@@ -1129,7 +1131,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
   int request_id = pending_context_menus_.Add(
       new scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>(menu));
 
-  content::ContextMenuParams params;
+  ContextMenuParams params;
   params.x = position.x();
   params.y = position.y();
   params.custom_context.is_pepper_menu = true;
@@ -1159,7 +1161,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
 }
 
 void PepperPluginDelegateImpl::OnContextMenuClosed(
-    const content::CustomContextMenuContext& custom_context) {
+    const CustomContextMenuContext& custom_context) {
   int request_id = custom_context.request_id;
   scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>* menu_ptr =
       pending_context_menus_.Lookup(request_id);
@@ -1181,7 +1183,7 @@ void PepperPluginDelegateImpl::OnContextMenuClosed(
 }
 
 void PepperPluginDelegateImpl::OnCustomContextMenuAction(
-    const content::CustomContextMenuContext& custom_context,
+    const CustomContextMenuContext& custom_context,
     unsigned action) {
   // Just save the action.
   DCHECK(!has_saved_context_menu_action_);
@@ -1203,7 +1205,7 @@ gfx::Size PepperPluginDelegateImpl::GetScreenSize() {
 std::string PepperPluginDelegateImpl::GetDefaultEncoding() {
   // TODO(brettw) bug 56615: Somehow get the preference for the default
   // encoding here rather than using the global default for the UI language.
-  return content::GetContentClient()->renderer()->GetDefaultEncoding();
+  return GetContentClient()->renderer()->GetDefaultEncoding();
 }
 
 void PepperPluginDelegateImpl::ZoomLimitsChanged(double minimum_factor,
@@ -1241,7 +1243,7 @@ void PepperPluginDelegateImpl::SaveURLAs(const GURL& url) {
 
 webkit_glue::P2PTransport* PepperPluginDelegateImpl::CreateP2PTransport() {
 #if defined(ENABLE_P2P_APIS)
-  return new content::P2PTransportImpl(render_view_->p2p_socket_dispatcher());
+  return new P2PTransportImpl(render_view_->p2p_socket_dispatcher());
 #else
   return NULL;
 #endif
@@ -1322,7 +1324,7 @@ bool PepperPluginDelegateImpl::IsInFullscreenMode() {
 
 void PepperPluginDelegateImpl::SampleGamepads(WebKit::WebGamepads* data) {
   if (!gamepad_shared_memory_reader_.get())
-    gamepad_shared_memory_reader_.reset(new content::GamepadSharedMemoryReader);
+    gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader);
   gamepad_shared_memory_reader_->SampleGamepads(*data);
 }
 
@@ -1603,3 +1605,5 @@ webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h
index 5ee07af..0934df8 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h
@@ -29,15 +29,8 @@
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 
 class FilePath;
-class PepperBrokerImpl;
-class PepperDeviceEnumerationEventHandler;
-class PepperPluginDelegateImpl;
 class RenderViewImpl;
-
-namespace content {
-class GamepadSharedMemoryReader;
-struct CustomContextMenuContext;
-}
+class TransportDIB;
 
 namespace gfx {
 class Point;
@@ -69,13 +62,19 @@ struct WebCompositionUnderline;
 struct WebFileChooserParams;
 }
 
-class TransportDIB;
+namespace content {
+
+struct CustomContextMenuContext;
+class GamepadSharedMemoryReader;
+class PepperBrokerImpl;
+class PepperDeviceEnumerationEventHandler;
+class PepperPluginDelegateImpl;
 
 class PepperPluginDelegateImpl
     : public webkit::ppapi::PluginDelegate,
       public base::SupportsWeakPtr<PepperPluginDelegateImpl>,
       public PepperParentContextProvider,
-      public content::RenderViewObserver {
+      public RenderViewObserver {
  public:
   explicit PepperPluginDelegateImpl(RenderViewImpl* render_view);
   virtual ~PepperPluginDelegateImpl();
@@ -317,9 +316,9 @@ class PepperPluginDelegateImpl
       webkit::ppapi::PPB_Flash_Menu_Impl* menu,
       const gfx::Point& position) OVERRIDE;
   void OnContextMenuClosed(
-      const content::CustomContextMenuContext& custom_context);
+      const CustomContextMenuContext& custom_context);
   void OnCustomContextMenuAction(
-      const content::CustomContextMenuContext& custom_context,
+      const CustomContextMenuContext& custom_context,
       unsigned action);
   void CompleteShowContextMenu(int request_id,
                                bool did_select,
@@ -477,7 +476,7 @@ class PepperPluginDelegateImpl
   // when it is destroyed via InstanceDeleted().
   webkit::ppapi::PluginInstance* last_mouse_event_target_;
 
-  scoped_ptr<content::GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
+  scoped_ptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
 
   scoped_ptr<PepperDeviceEnumerationEventHandler>
       device_enumeration_event_handler_;
@@ -485,4 +484,6 @@ class PepperPluginDelegateImpl
   DISALLOW_COPY_AND_ASSIGN(PepperPluginDelegateImpl);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_IMPL_H_
diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
index cdfade3..3fef0dd 100644
--- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
@@ -6,6 +6,8 @@
 
 #include "content/common/child_process.h"
 
+namespace content {
+
 PepperProxyChannelDelegateImpl::~PepperProxyChannelDelegateImpl() {
 }
 
@@ -19,3 +21,5 @@ base::WaitableEvent* PepperProxyChannelDelegateImpl::GetShutdownEvent() {
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->GetShutDownEvent();
 }
+
+}  // namespace content
diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h
index 1bffc27..94636a6 100644
--- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h
+++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h
@@ -8,6 +8,8 @@
 #include "base/compiler_specific.h"
 #include "ppapi/proxy/proxy_channel.h"
 
+namespace content {
+
 class PepperProxyChannelDelegateImpl
     : public ppapi::proxy::ProxyChannel::Delegate {
  public:
@@ -18,4 +20,6 @@ class PepperProxyChannelDelegateImpl
   virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PROXY_CHANNEL_DELEGATE_IMPL_H_
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 7d16938..c0d6b48 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -1309,7 +1309,7 @@ class RenderViewImpl : public RenderWidget,
 
   // NOTE: pepper_delegate_ should be last member because its constructor calls
   // AddObservers method of RenderViewImpl from c-tor.
-  PepperPluginDelegateImpl pepper_delegate_;
+  content::PepperPluginDelegateImpl pepper_delegate_;
 
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index d0ab18b..ad3d9d8 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -305,7 +305,7 @@ void RenderWidgetFullscreenPepper::DidChangeCursor(
 webkit::ppapi::PluginDelegate::PlatformContext3D*
 RenderWidgetFullscreenPepper::CreateContext3D() {
 #ifdef ENABLE_GPU
-  return new PlatformContext3DImpl(this);
+  return new content::PlatformContext3DImpl(this);
 #else
   return NULL;
 #endif
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index a91dfa2..cf45611 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -29,7 +29,7 @@ class PluginInstance;
 class RenderWidgetFullscreenPepper :
     public RenderWidgetFullscreen,
     public webkit::ppapi::FullscreenContainer,
-    public PepperParentContextProvider,
+    public content::PepperParentContextProvider,
     public WebGraphicsContext3DSwapBuffersClient {
  public:
   static RenderWidgetFullscreenPepper* Create(