Create a public header with the child_process_sandbox_support_linux functions that are used in chrome. Also move everything to the content namespace, now that we have one. This gets rid of the last content/common includes from chrome/renderer and so I've tightened up the DEPS.

Also get rid of the webkit_glue versions of the font functions since they weren't used anymore.

BUG=98716
Review URL: http://codereview.chromium.org/8319017

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

7 files changed, 11 insertions, 14 deletions

diff --git a/chrome/DEPS b/chrome/DEPS
index 39a6eda..b5c9b6e 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -12,6 +12,8 @@ include_rules = [
   "+chrome/common",
   "+chrome/test",
   "-content",
+  # TODO(jam): remove me once chrome only consumes content/common through its
+  # public headers.
   "+content/common",
   "+content/public/common",
   "+content/test",
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc
index c1d4447..678a87f 100644
--- a/chrome/nacl/nacl_listener.cc
+++ b/chrome/nacl/nacl_listener.cc
@@ -16,7 +16,7 @@
 #include "native_client/src/shared/imc/nacl_imc.h"
 
 #if defined(OS_LINUX)
-#include "content/common/child_process_sandbox_support_linux.h"
+#include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
@@ -100,8 +100,7 @@ void NaClListener::OnStartSelLdr(
     std::vector<nacl::FileDescriptor> handles,
     bool have_irt_file) {
 #if defined(OS_LINUX)
-  nacl::SetCreateMemoryObjectFunc(
-      child_process_sandbox_support::MakeSharedMemorySegmentViaIPC);
+  nacl::SetCreateMemoryObjectFunc(content::MakeSharedMemorySegmentViaIPC);
 #elif defined(OS_MACOSX)
   nacl::SetCreateMemoryObjectFunc(CreateMemoryObject);
   CHECK(handles.size() >= 1);
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 642e7a4..899ba5c 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -1,5 +1,7 @@
 include_rules = [
   "+chrome/app",  # The plugins use the theme library to get the sad plugin bitmap.
+  # TODO(jam): remove this once all of chrome doesn't depend on content/common.
+  "-content/common",
   "+content/public/renderer",
   "+grit",  # For generated headers
   "+media/base",  # For initializing media library and media switches.
diff --git a/chrome/renderer/chrome_mock_render_thread.cc b/chrome/renderer/chrome_mock_render_thread.cc
index 3e2df0f..027998d 100644
--- a/chrome/renderer/chrome_mock_render_thread.cc
+++ b/chrome/renderer/chrome_mock_render_thread.cc
@@ -12,7 +12,6 @@
 #include "chrome/common/print_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "content/common/view_messages.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "printing/print_job_constants.h"
diff --git a/chrome/renderer/chrome_ppb_pdf_impl.cc b/chrome/renderer/chrome_ppb_pdf_impl.cc
index f5f62d3..e9b5174 100644
--- a/chrome/renderer/chrome_ppb_pdf_impl.cc
+++ b/chrome/renderer/chrome_ppb_pdf_impl.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
-#include "content/common/child_process_sandbox_support_linux.h"
+#include "content/public/common/child_process_sandbox_support_linux.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/webkit_resources.h"
@@ -52,7 +52,7 @@ class PrivateFontFile : public ppapi::Resource {
                     void* output,
                     uint32_t* output_length) {
     size_t temp_size = static_cast<size_t>(*output_length);
-    bool rv = child_process_sandbox_support::GetFontTable(
+    bool rv = content::GetFontTable(
         fd_, table, static_cast<uint8_t*>(output), &temp_size);
     *output_length = static_cast<uint32_t>(temp_size);
     return rv;
@@ -195,7 +195,7 @@ PP_Resource GetFontFileWithFallback(
   if (!face_name)
     return 0;
 
-  int fd = child_process_sandbox_support::MatchFontWithFallback(
+  int fd = content::MatchFontWithFallback(
       face_name->value().c_str(),
       description->weight >= PP_FONTWEIGHT_BOLD,
       description->italic,
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index e61a2f6..a8d0e24 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -6,7 +6,6 @@
 
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "content/common/database_messages.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc
index 735501d..bc11b17 100644
--- a/chrome/renderer/content_settings_observer_browsertest.cc
+++ b/chrome/renderer/content_settings_observer_browsertest.cc
@@ -6,7 +6,6 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/test/base/chrome_render_view_test.h"
-#include "content/common/view_messages.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -115,13 +114,10 @@ TEST_F(ChromeRenderViewTest, JSBlockSentAfterPageLoad) {
   render_thread_->sink().ClearMessages();
 
   // 3. Reload page.
-  ViewMsg_Navigate_Params params;
   std::string url_str = "data:text/html;charset=utf-8,";
   url_str.append(html);
   GURL url(url_str);
-  params.url = url;
-  params.navigation_type = ViewMsg_Navigate_Type::RELOAD;
-  OnNavigate(params);
+  Reload(url);
   ProcessPendingMessages();
 
   // 4. Verify that the notification that javascript was blocked is sent after
@@ -130,7 +126,7 @@ TEST_F(ChromeRenderViewTest, JSBlockSentAfterPageLoad) {
   int block_index = -1;
   for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
     const IPC::Message* msg = render_thread_->sink().GetMessageAt(i);
-    if (msg->type() == ViewHostMsg_FrameNavigate::ID)
+    if (msg->type() == GetNavigationIPCType())
       navigation_index = i;
     if (msg->type() == ChromeViewHostMsg_ContentBlocked::ID)
       block_index = i;