Move child-common classes to content/common_child

We need a place to put code that is shared between child processes of different
types but not used in the browser process. For instance, the NPObject bindings
code is used in the plugin and renderer processes but depends on WebBindings
which the browser shouldn't depend on. Some web platform features require shared
code between renderer and worker processe. The WebKit image decoders are used
by worker, renderer and utility processes.

This creates a content/common_child directory for code shared by more than one
child process type. content/common_child can depend on content/common and all
content/ subdirs except for content/browser and content/common can depend on it.

The java bridge code is (more than a) bit busted since it pulls the NPObject
bindings in to the browser, but since this code is only intended for use on
android single-process configurations I've just created DEPS exceptions for
this bit of code.

BUG=241606

Review URL: https://chromiumcodereview.appspot.com/15047014

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

8 files changed, 15 insertions, 12 deletions

diff --git a/content/plugin/DEPS b/content/plugin/DEPS
index b8d10ee..90fcc14 100644
--- a/content/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "-chrome",
   "+content/public/plugin",
+  "+content/common_child",
   "+sandbox/win/src",
   "+skia/ext",
   "+third_party/npapi",
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index 781ca00..bc13d39 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -12,7 +12,8 @@
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
-#include "content/common/plugin_messages.h"
+#include "content/common/plugin_process_messages.h"
+#include "content/common_child/plugin_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_delegate_stub.h"
@@ -250,7 +251,7 @@ bool PluginChannel::OnControlMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_DestroyInstance,
                                     OnDestroyInstance)
     IPC_MESSAGE_HANDLER(PluginMsg_GenerateRouteID, OnGenerateRouteID)
-    IPC_MESSAGE_HANDLER(PluginMsg_ClearSiteData, OnClearSiteData)
+    IPC_MESSAGE_HANDLER(PluginProcessMsg_ClearSiteData, OnClearSiteData)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
@@ -317,7 +318,7 @@ void PluginChannel::OnClearSiteData(const std::string& site,
       success = (err == NPERR_NO_ERROR);
     }
   }
-  Send(new PluginHostMsg_ClearSiteDataResult(success));
+  Send(new PluginProcessHostMsg_ClearSiteDataResult(success));
 }
 
 }  // namespace content
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index c717bd6..70b36b7 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_handle.h"
 #include "base/process.h"
 #include "build/build_config.h"
-#include "content/common/np_channel_base.h"
+#include "content/common_child/np_channel_base.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 
 namespace base {
diff --git a/content/plugin/plugin_interpose_util_mac.mm b/content/plugin/plugin_interpose_util_mac.mm
index f58d1d3..1166e6c 100644
--- a/content/plugin/plugin_interpose_util_mac.mm
+++ b/content/plugin/plugin_interpose_util_mac.mm
@@ -7,7 +7,7 @@
 #import <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
-#include "content/common/plugin_messages.h"
+#include "content/common/plugin_process_messages.h"
 #include "content/plugin/plugin_thread.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 27e3f55..623bd88 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -21,8 +21,8 @@
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_process.h"
-#include "content/common/npobject_util.h"
-#include "content/common/plugin_messages.h"
+#include "content/common/plugin_process_messages.h"
+#include "content/common_child/npobject_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 5c25961..afd5f52 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
-#include "content/common/plugin_messages.h"
+#include "content/common_child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_proxy.h"
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index 7be92617..b8a2a66 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/common/npobject_stub.h"
+#include "content/common_child/npobject_stub.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 23a7ec9..f0834d0 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -11,9 +11,9 @@
 #include "base/memory/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
-#include "content/common/npobject_proxy.h"
-#include "content/common/npobject_util.h"
-#include "content/common/plugin_messages.h"
+#include "content/common_child/npobject_proxy.h"
+#include "content/common_child/npobject_util.h"
+#include "content/common_child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_client.h"
@@ -36,6 +36,7 @@
 #endif
 
 #if defined(OS_WIN)
+#include "content/common/plugin_process_messages.h"
 #include "content/public/common/sandbox_init.h"
 #endif