Move npobject_proxy, npobject_stub and npobject_util from content/plugin to content/common

Note that these classes still depend on PluginChannel and PluginThread, which
live in content/plugin. This will be fixed in a later change.

BUG=96703

Review URL: http://codereview.chromium.org/7979002

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

17 files changed, 33 insertions, 34 deletions

diff --git a/content/common/DEPS b/content/common/DEPS
index 4184762..f88c66e 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+media/base/media_log_event.h",
+  "+content/plugin",  # FIXME: For PluginChannel and PluginThread
 ]
diff --git a/content/plugin/npobject_proxy.cc b/content/common/npobject_proxy.cc
index cb0ed89..436f61f 100644
--- a/content/plugin/npobject_proxy.cc
+++ b/content/common/npobject_proxy.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/plugin/npobject_proxy.h"
+#include "content/common/npobject_proxy.h"
 
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/npobject_util.h"
 #include "content/plugin/plugin_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/content/plugin/npobject_proxy.h b/content/common/npobject_proxy.h
index fea41ff..1902dd1 100644
--- a/content/plugin/npobject_proxy.h
+++ b/content/common/npobject_proxy.h
@@ -5,8 +5,8 @@
 // A proxy for NPObject that sends all calls to the object to an NPObjectStub
 // running in a different process.
 
-#ifndef CONTENT_PLUGIN_NPOBJECT_PROXY_H_
-#define CONTENT_PLUGIN_NPOBJECT_PROXY_H_
+#ifndef CONTENT_COMMON_NPOBJECT_PROXY_H_
+#define CONTENT_COMMON_NPOBJECT_PROXY_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -120,4 +120,4 @@ class NPObjectProxy : public IPC::Channel::Listener,
   GURL page_url_;
 };
 
-#endif  // CONTENT_PLUGIN_NPOBJECT_PROXY_H_
+#endif  // CONTENT_COMMON_NPOBJECT_PROXY_H_
diff --git a/content/plugin/npobject_stub.cc b/content/common/npobject_stub.cc
index 5b50a7b..af0f33a 100644
--- a/content/plugin/npobject_stub.cc
+++ b/content/common/npobject_stub.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/plugin/npobject_stub.h"
+#include "content/common/npobject_stub.h"
 
 #include "content/common/content_client.h"
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/npobject_util.h"
 #include "content/plugin/plugin_thread.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
diff --git a/content/plugin/npobject_stub.h b/content/common/npobject_stub.h
index 7dbc32f..b99ef64 100644
--- a/content/plugin/npobject_stub.h
+++ b/content/common/npobject_stub.h
@@ -5,8 +5,8 @@
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
-#ifndef CONTENT_PLUGIN_NPOBJECT_STUB_H_
-#define CONTENT_PLUGIN_NPOBJECT_STUB_H_
+#ifndef CONTENT_COMMON_NPOBJECT_STUB_H_
+#define CONTENT_COMMON_NPOBJECT_STUB_H_
 #pragma once
 
 #include <vector>
@@ -92,4 +92,4 @@ class NPObjectStub : public IPC::Channel::Listener,
   GURL page_url_;
 };
 
-#endif  // CONTENT_PLUGIN_NPOBJECT_STUB_H_
+#endif  // CONTENT_COMMON_NPOBJECT_STUB_H_
diff --git a/content/plugin/npobject_util.cc b/content/common/npobject_util.cc
index 8890280..5d188f6 100644
--- a/content/plugin/npobject_util.cc
+++ b/content/common/npobject_util.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/plugin/npobject_util.h"
+#include "content/common/npobject_util.h"
 
 #include "base/string_util.h"
 #include "content/common/np_channel_base.h"
+#include "content/common/npobject_proxy.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/npobject_proxy.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/plugins/npapi/plugin_host.h"
diff --git a/content/plugin/npobject_util.h b/content/common/npobject_util.h
index 7e5cb07..300bbd3 100644
--- a/content/plugin/npobject_util.h
+++ b/content/common/npobject_util.h
@@ -4,8 +4,8 @@
 //
 // Helper functions that are used by the NPObject proxy and stub.
 
-#ifndef CONTENT_PLUGIN_NPOBJECT_UTIL_H_
-#define CONTENT_PLUGIN_NPOBJECT_UTIL_H_
+#ifndef CONTENT_COMMON_NPOBJECT_UTIL_H_
+#define CONTENT_COMMON_NPOBJECT_UTIL_H_
 #pragma once
 
 #include "build/build_config.h"
@@ -14,7 +14,7 @@
 #include <windows.h>
 #endif
 
-#include "content/plugin/npobject_stub.h"
+#include "content/common/npobject_stub.h"
 
 class GURL;
 class NPObjectProxy;
@@ -70,4 +70,4 @@ bool CreateNPVariant(const NPVariant_Param& param,
 HANDLE GetMessageBoxEvent(HWND hwnd);
 #endif  // defined(OS_WIN)
 
-#endif  // CONTENT_PLUGIN_NPOBJECT_UTIL_H_
+#endif  // CONTENT_COMMON_NPOBJECT_UTIL_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 7dcffce..f9bc297 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -170,6 +170,12 @@
     'common/np_channel_base.cc',
     'common/np_channel_base.h',
     'common/npobject_base.h',
+    'common/npobject_proxy.cc',
+    'common/npobject_proxy.h',
+    'common/npobject_stub.cc',
+    'common/npobject_stub.h',
+    'common/npobject_util.cc',
+    'common/npobject_util.h',
     'common/p2p_messages.h',
     'common/p2p_sockets.h',
     'common/page_transition_types.cc',
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 969d3c0..4ef9ca2 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -16,12 +16,6 @@
         # All .cc, .h, .m, and .mm files under plugins except for tests and
         # mocks.
         'plugin/content_plugin_client.h',
-        'plugin/npobject_proxy.cc',
-        'plugin/npobject_proxy.h',
-        'plugin/npobject_stub.cc',
-        'plugin/npobject_stub.h',
-        'plugin/npobject_util.cc',
-        'plugin/npobject_util.h',
         'plugin/plugin_channel.cc',
         'plugin/plugin_channel.h',
         'plugin/plugin_interpose_util_mac.mm',
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index af66f09..67c7cff 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -21,9 +21,9 @@
 #include "base/threading/thread_local.h"
 #include "content/common/child_process.h"
 #include "content/common/content_switches.h"
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/plugin/content_plugin_client.h"
-#include "content/plugin/npobject_util.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 9a6fdbc..dce1058 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -11,8 +11,8 @@
 #include "content/common/content_client.h"
 #include "content/common/content_constants.h"
 #include "content/common/content_switches.h"
+#include "content/common/npobject_stub.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/npobject_stub.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_proxy.cc b/content/plugin/webplugin_proxy.cc
index c01bc55..2f7ef5f 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -11,10 +11,10 @@
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "content/common/content_client.h"
+#include "content/common/npobject_proxy.h"
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/url_constants.h"
-#include "content/plugin/npobject_proxy.h"
-#include "content/plugin/npobject_util.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 01805b7..ccb1fad 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -1,7 +1,6 @@
 include_rules = [
   "-chrome",
   "+chrome/test",
-  "+content/plugin",  # For shared npruntime proxying code.
   "+media",  # For audio input/output and audio/video decoding.
   "+third_party/mach_override",
   "+third_party/tcmalloc",
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index d50ec17..db4d7b1 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -27,12 +27,12 @@
 #include "content/common/db_message_filter.h"
 #include "content/common/dom_storage_messages.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/web_database_observer_impl.h"
-#include "content/plugin/npobject_util.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
@@ -72,7 +72,6 @@
 // TODO(port)
 #if defined(OS_WIN)
 #include "content/common/child_process_messages.h"
-#include "content/plugin/plugin_channel.h"
 #else
 #include "base/memory/scoped_handle.h"
 #include "content/common/np_channel_base.h"
diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc
index 8f20b36..0a92257 100644
--- a/content/renderer/renderer_glue.cc
+++ b/content/renderer/renderer_glue.cc
@@ -19,10 +19,10 @@
 #include "content/common/clipboard_messages.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.h"
+#include "content/common/npobject_util.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
-#include "content/plugin/npobject_util.h"
 #include "content/renderer/render_thread.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 2ca0e7c..d5b6208 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -15,10 +15,10 @@
 #include "content/common/file_system/webfilesystem_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
+#include "content/common/npobject_util.h"
 #include "content/common/view_messages.h"
 #include "content/common/webblobregistry_impl.h"
 #include "content/common/webmessageportchannel_impl.h"
-#include "content/plugin/npobject_util.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/media/audio_device.h"
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index e26129b..3b7223c 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -21,11 +21,11 @@
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "content/common/child_process.h"
+#include "content/common/npobject_proxy.h"
+#include "content/common/npobject_stub.h"
+#include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
-#include "content/plugin/npobject_proxy.h"
-#include "content/plugin/npobject_stub.h"
-#include "content/plugin/npobject_util.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/plugin_channel_host.h"