Convert the pp::proxy namespace to the ppapi::proxy namespace.

content/ppapi_plugin/ppapi_thread.cc

 // Copyright (c) 2011 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 33 matching lines @@
       local_pp_module_(
           base::RandInt(0, std::numeric_limits<PP_Module>::max())),
       next_plugin_dispatcher_id_(1) {
 }
 
 PpapiThread::~PpapiThread() {
   if (!library_.is_valid())
     return;
 
   // The ShutdownModule/ShutdownBroker function is optional.
-  pp::proxy::ProxyChannel::ShutdownModuleFunc shutdown_function =
+  ppapi::proxy::ProxyChannel::ShutdownModuleFunc shutdown_function =
       is_broker_ ?
-      reinterpret_cast<pp::proxy::ProxyChannel::ShutdownModuleFunc>(
+      reinterpret_cast<ppapi::proxy::ProxyChannel::ShutdownModuleFunc>(
           library_.GetFunctionPointer("PPP_ShutdownBroker")) :
-      reinterpret_cast<pp::proxy::ProxyChannel::ShutdownModuleFunc>(
+      reinterpret_cast<ppapi::proxy::ProxyChannel::ShutdownModuleFunc>(
           library_.GetFunctionPointer("PPP_ShutdownModule"));
   if (shutdown_function)
     shutdown_function();
 }
 
 // The "regular" ChildThread implements this function and does some standard
 // dispatching, then uses the message router. We don't actually need any of
 // this so this function just overrides that one.
 //
 // Note that this function is called only for messages from the channel to the
@@ skipping 36 matching lines @@
                                      const base::Closure& task) {
   if (!webkit_thread_.get())
     webkit_thread_.reset(new PpapiWebKitThread);
   webkit_thread_->PostTask(from_here, task);
 }
 
 bool PpapiThread::SendToBrowser(IPC::Message* msg) {
   return Send(msg);
 }
 
-uint32 PpapiThread::Register(pp::proxy::PluginDispatcher* plugin_dispatcher) {
+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 {
     // Although it is unlikely, make sure that we won't cause any trouble when
     // the counter overflows.
     id = next_plugin_dispatcher_id_++;
@@ skipping 46 matching lines @@
       LOG(WARNING) << "InitBroker failed with error " << init_error;
       return;
     }
     if (!connect_instance_func_) {
       LOG(WARNING) << "InitBroker did not provide PP_ConnectInstance_Func";
       return;
     }
   } else {
     // Get the GetInterface function (required).
     get_plugin_interface_ =
-        reinterpret_cast<pp::proxy::Dispatcher::GetInterfaceFunc>(
+        reinterpret_cast<ppapi::proxy::Dispatcher::GetInterfaceFunc>(
             library.GetFunctionPointer("PPP_GetInterface"));
     if (!get_plugin_interface_) {
       LOG(WARNING) << "No PPP_GetInterface in plugin library";
       return;
     }
 
 #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.
     CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
     SandboxInitWrapper sandbox_wrapper;
     if (!sandbox_wrapper.InitializeSandbox(*parsed_command_line,
                                            switches::kPpapiPluginProcess))
       LOG(WARNING) << "Failed to initialize sandbox";
 #endif
 
     // Get the InitializeModule function (required).
-    pp::proxy::Dispatcher::InitModuleFunc init_module =
-        reinterpret_cast<pp::proxy::Dispatcher::InitModuleFunc>(
+    ppapi::proxy::Dispatcher::InitModuleFunc init_module =
+        reinterpret_cast<ppapi::proxy::Dispatcher::InitModuleFunc>(
             library.GetFunctionPointer("PPP_InitializeModule"));
     if (!init_module) {
       LOG(WARNING) << "No PPP_InitializeModule in plugin library";
       return;
     }
     int32_t init_error = init_module(
         local_pp_module_,
-        &pp::proxy::PluginDispatcher::GetInterfaceFromDispatcher);
+        &ppapi::proxy::PluginDispatcher::GetInterfaceFromDispatcher);
     if (init_error != PP_OK) {
       LOG(WARNING) << "InitModule failed with error " << init_error;
       return;
     }
   }
 
   library_.Reset(library.Release());
 }
 
 void PpapiThread::OnMsgCreateChannel(base::ProcessHandle host_process_handle,
@@ skipping 19 matching lines @@
 }
 
 void PpapiThread::OnPluginDispatcherMessageReceived(const IPC::Message& msg) {
   // The first parameter should be a plugin dispatcher ID.
   void* iter = NULL;
   uint32 id = 0;
   if (!msg.ReadUInt32(&iter, &id)) {
     NOTREACHED();
     return;
   }
-  std::map<uint32, pp::proxy::PluginDispatcher*>::iterator dispatcher =
+  std::map<uint32, ppapi::proxy::PluginDispatcher*>::iterator dispatcher =
       plugin_dispatchers_.find(id);
   if (dispatcher != plugin_dispatchers_.end())
     dispatcher->second->OnMessageReceived(msg);
 }
 
 bool PpapiThread::SetupRendererChannel(base::ProcessHandle host_process_handle,
                                        int renderer_id,
                                        IPC::ChannelHandle* handle) {
   DCHECK(is_broker_ == (connect_instance_func_ != NULL));
   DCHECK(is_broker_ == (get_plugin_interface_ == NULL));
   IPC::ChannelHandle plugin_handle;
   plugin_handle.name = StringPrintf("%d.r%d", base::GetCurrentProcId(),
                                     renderer_id);
 
-  pp::proxy::ProxyChannel* dispatcher = NULL;
+  ppapi::proxy::ProxyChannel* dispatcher = NULL;
   bool init_result = false;
   if (is_broker_) {
     BrokerProcessDispatcher* broker_dispatcher =
         new BrokerProcessDispatcher(host_process_handle,
                                     connect_instance_func_);
     init_result = broker_dispatcher->InitBrokerWithChannel(this,
                                                            plugin_handle,
                                                            false);
     dispatcher = broker_dispatcher;
   } else {
@@ skipping 14 matching lines @@
 #if defined(OS_POSIX)
   // On POSIX, pass the renderer-side FD.
   handle->socket = base::FileDescriptor(::dup(dispatcher->GetRendererFD()),
                                         true);
 #endif
 
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
   return true;
 }