Move content's a plugin, ppapi_plugin, utility, and worker subdirectories to the content namespace.

content/ppapi_plugin/ppapi_thread.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/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
@@ skipping 27 matching lines @@
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
 #endif
 
 #if defined(OS_WIN)
 extern sandbox::TargetServices* g_target_services;
 #else
 extern void* g_target_services;
 #endif
 
+namespace content {
+
 typedef int32_t (*InitializeBrokerFunc)
     (PP_ConnectInstance_Func* connect_instance_func);
 
 PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
     : is_broker_(is_broker),
       get_plugin_interface_(NULL),
       connect_instance_func_(NULL),
       local_pp_module_(
           base::RandInt(0, std::numeric_limits<PP_Module>::max())),
       next_plugin_dispatcher_id_(1) {
@@ skipping 90 matching lines @@
     const IPC::SyncChannel& channel,
     bool should_close_source) {
 #if defined(OS_WIN)
   if (peer_handle_.IsValid()) {
     DCHECK(is_broker_);
     return IPC::GetFileHandleForProcess(handle, peer_handle_,
                                         should_close_source);
   }
 #endif
 
-  return content::BrokerGetFileHandleForProcess(handle, channel.peer_pid(),
-                                                should_close_source);
+  return BrokerGetFileHandleForProcess(handle, channel.peer_pid(),
+                                       should_close_source);
 }
 
 std::set<PP_Instance>* PpapiThread::GetGloballySeenInstanceIDSet() {
   return &globally_seen_instance_ids_;
 }
 
 bool PpapiThread::SendToBrowser(IPC::Message* msg) {
   if (MessageLoop::current() == message_loop())
     return ChildThread::Send(msg);
 
@@ skipping 10 matching lines @@
 }
 
 void PpapiThread::PreCacheFont(const void* logfontw) {
 #if defined(OS_WIN)
   Send(new ChildProcessHostMsg_PreCacheFont(
       *static_cast<const LOGFONTW*>(logfontw)));
 #endif
 }
 
 void PpapiThread::SetActiveURL(const std::string& url) {
-  content::GetContentClient()->SetActiveURL(GURL(url));
+  GetContentClient()->SetActiveURL(GURL(url));
 }
 
 uint32 PpapiThread::Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) {
   if (!plugin_dispatcher ||
       plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) {
     return 0;
   }
 
   uint32 id = 0;
   do {
@@ skipping 68 matching lines @@
     }
     if (!connect_instance_func_) {
       LOG(WARNING) << "InitBroker did not provide PP_ConnectInstance_Func";
       return;
     }
   } else {
 #if defined(OS_MACOSX)
     // We need to do this after getting |PPP_GetInterface()| (or presumably
     // doing something nontrivial with the library), else the sandbox
     // intercedes.
-    if (!content::InitializeSandbox()) {
+    if (!InitializeSandbox()) {
       LOG(WARNING) << "Failed to initialize sandbox";
     }
 #endif
 
     // Get the InitializeModule function (required for non-broker code).
     PP_InitializeModule_Func init_module =
         reinterpret_cast<PP_InitializeModule_Func>(
             library.GetFunctionPointer("PPP_InitializeModule"));
     if (!init_module) {
       LOG(WARNING) << "No PPP_InitializeModule in plugin library";
@@ skipping 102 matching lines @@
   // lifetime of the attached channel.
   return true;
 }
 
 void PpapiThread::SavePluginName(const FilePath& path) {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_name(
       path.BaseName().AsUTF8Unsafe());
 
   // plugin() is NULL when in-process.  Which is fine, because this is
   // just a hook for setting the process name.
-  if (content::GetContentClient()->plugin()) {
-    content::GetContentClient()->plugin()->PluginProcessStarted(
+  if (GetContentClient()->plugin()) {
+    GetContentClient()->plugin()->PluginProcessStarted(
         path.BaseName().RemoveExtension().LossyDisplayName());
   }
 }
+
+}  // namespace content