Move a bunch of code in content\renderer to the content namespace.

content/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 54 matching lines @@
 #include "content/public/common/sandbox_init.h"
 #endif
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using WebKit::WebDragData;
 using WebKit::WebInputEvent;
 using WebKit::WebString;
 using WebKit::WebView;
 
+namespace content {
+
 namespace {
 
 class ScopedLogLevel {
  public:
   explicit ScopedLogLevel(int level);
   ~ScopedLogLevel();
 
  private:
   int old_level_;
 
@@ skipping 366 matching lines @@
 
 void WebPluginDelegateProxy::DidFinishManualLoading() {
   Send(new PluginMsg_DidFinishManualLoading(instance_id_));
 }
 
 void WebPluginDelegateProxy::DidManualLoadFail() {
   Send(new PluginMsg_DidManualLoadFail(instance_id_));
 }
 
 bool WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) {
-  content::GetContentClient()->SetActiveURL(page_url_);
+  GetContentClient()->SetActiveURL(page_url_);
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebPluginDelegateProxy, msg)
     IPC_MESSAGE_HANDLER(PluginHostMsg_SetWindow, OnSetWindow)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(PluginHostMsg_SetWindowlessPumpEvent,
                         OnSetWindowlessPumpEvent)
     IPC_MESSAGE_HANDLER(PluginHostMsg_NotifyIMEStatus,
                         OnNotifyIMEStatus)
 #endif
@@ skipping 76 matching lines @@
   // FileDescriptor message fields needs to remain valid until the message is
   // sent or else the sendmsg() call will fail.
   if ((handle_out->fd = HANDLE_EINTR(dup(handle_in.fd))) < 0) {
     PLOG(ERROR) << "dup()";
     return;
   }
   handle_out->auto_close = true;
 #elif defined(OS_WIN)
   // On Windows we need to duplicate the handle for the plugin process.
   *handle_out = NULL;
-  content::BrokerDuplicateHandle(handle_in, peer_pid, handle_out,
-                                 FILE_MAP_READ | FILE_MAP_WRITE, 0);
+  BrokerDuplicateHandle(handle_in, peer_pid, handle_out,
+                        FILE_MAP_READ | FILE_MAP_WRITE, 0);
   DCHECK(*handle_out != NULL);
 #else
   // Don't need to do anything special for other platforms.
   *handle_out = handle_in;
 #endif
 }
 
 void WebPluginDelegateProxy::SendUpdateGeometry(
     bool bitmaps_changed) {
   PluginMsg_UpdateGeometry_Param param;
@@ skipping 678 matching lines @@
                                           std::string* cookies) {
   DCHECK(cookies);
   if (plugin_)
     *cookies = plugin_->GetCookies(url, first_party_for_cookies);
 }
 
 void WebPluginDelegateProxy::PaintSadPlugin(WebKit::WebCanvas* native_context,
                                             const gfx::Rect& rect) {
   // Lazily load the sad plugin image.
   if (!sad_plugin_)
-    sad_plugin_ = content::GetContentClient()->renderer()->GetSadPluginBitmap();
+    sad_plugin_ = GetContentClient()->renderer()->GetSadPluginBitmap();
   if (sad_plugin_)
     webkit::PaintSadPlugin(native_context, plugin_rect_, *sad_plugin_);
 }
 
 void WebPluginDelegateProxy::CopyFromBackBufferToFrontBuffer(
     const gfx::Rect& rect) {
 #if defined(OS_MACOSX)
   // Blitting the bits directly is much faster than going through CG, and since
   // the goal is just to move the raw pixels between two bitmaps with the same
   // pixel format (no compositing, color correction, etc.), it's safe.
@@ skipping 256 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
+
+}  // namespace content