Make the Pepper proxy support in-process font rendering.

chrome/nacl/nacl_launcher_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 "chrome/nacl/nacl_launcher_thread.h"
 
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/nacl_messages.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 
 #if defined(OS_LINUX)
-#include "content/renderer/renderer_sandbox_support_linux.h"
+#include "content/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
 #if defined(OS_MACOSX)
 namespace {
 
@@ skipping 64 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void NaClLauncherThread::OnStartSelLdr(
     std::vector<nacl::FileDescriptor> handles,
     bool have_irt_file) {
 #if defined(OS_LINUX)
   nacl::SetCreateMemoryObjectFunc(
-      renderer_sandbox_support::MakeSharedMemorySegmentViaIPC);
+      child_process_sandbox_support::MakeSharedMemorySegmentViaIPC);
 #elif defined(OS_MACOSX)
   nacl::SetCreateMemoryObjectFunc(CreateMemoryObject);
   CHECK(handles.size() >= 1);
   g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
   handles.pop_back();
 #endif
 
   if (have_irt_file) {
     CHECK(handles.size() >= 1);
     NaClHandle irt_handle = nacl::ToNativeHandle(handles[handles.size() - 1]);
@@ skipping 11 matching lines @@
     NaClSetIrtFileDesc(irt_desc);
   }
 
   scoped_array<NaClHandle> array(new NaClHandle[handles.size()]);
   for (size_t i = 0; i < handles.size(); i++) {
     array[i] = nacl::ToNativeHandle(handles[i]);
   }
   NaClMainForChromium(static_cast<int>(handles.size()), array.get(),
                       debug_enabled_);
 }