Move npapi related files from content\child to the new content\child\npapi directory.

R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/19462016

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

28 files changed, 65 insertions, 66 deletions

diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.h b/content/browser/renderer_host/java/java_bridge_channel_host.h
index 2f54259..3f3f146 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.h
+++ b/content/browser/renderer_host/java/java_bridge_channel_host.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
 
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 
 namespace content {
 
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
index c47414b..eeb8d96 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
@@ -10,8 +10,8 @@
 #include "content/browser/renderer_host/java/java_bridge_channel_host.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/child/child_process.h"
-#include "content/child/npobject_stub.h"
-#include "content/child/npobject_util.h"  // For CreateNPVariantParam()
+#include "content/child/npapi/npobject_stub.h"
+#include "content/child/npapi/npobject_util.h"  // For CreateNPVariantParam()
 #include "content/common/java_bridge_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
index 7dbb47a..6d44c39 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "content/child/npobject_stub.h"
+#include "content/child/npapi/npobject_stub.h"
 #include "content/public/browser/render_view_host_observer.h"
 
 class RouteIDGenerator;
diff --git a/content/child/np_channel_base.cc b/content/child/npapi/np_channel_base.cc
index 23805e7..da77c44 100644
--- a/content/child/np_channel_base.cc
+++ b/content/child/npapi/np_channel_base.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 
 #include <stack>
 
diff --git a/content/child/np_channel_base.h b/content/child/npapi/np_channel_base.h
index a89e5bf..f0a9466 100644
--- a/content/child/np_channel_base.h
+++ b/content/child/npapi/np_channel_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_CHILD_NP_CHANNEL_BASE_H_
-#define CONTENT_CHILD_NP_CHANNEL_BASE_H_
+#ifndef CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_
+#define CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
-#include "content/child/npobject_base.h"
+#include "content/child/npapi/npobject_base.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
@@ -221,4 +221,4 @@ class NPChannelBase : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NP_CHANNEL_BASE_H_
+#endif  // CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_
diff --git a/content/child/npobject_base.h b/content/child/npapi/npobject_base.h
index 042daf7..9897139 100644
--- a/content/child/npobject_base.h
+++ b/content/child/npapi/npobject_base.h
@@ -5,8 +5,8 @@
 // Base interface used by NPChannelBase and implemented by NPObjectProxy and
 // NPObjectStub.
 
-#ifndef CONTENT_CHILD_NPOBJECT_BASE_H_
-#define CONTENT_CHILD_NPOBJECT_BASE_H_
+#ifndef CONTENT_CHILD_NPAPI_NPOBJECT_BASE_H_
+#define CONTENT_CHILD_NPAPI_NPOBJECT_BASE_H_
 
 #include "ipc/ipc_listener.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ -28,4 +28,4 @@ class NPObjectBase {
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NPOBJECT_BASE_H_
+#endif  // CONTENT_CHILD_NPAPI_NPOBJECT_BASE_H_
diff --git a/content/child/npobject_proxy.cc b/content/child/npapi/npobject_proxy.cc
index 2bb3dca..dcab2b4 100644
--- a/content/child/npobject_proxy.cc
+++ b/content/child/npapi/npobject_proxy.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/child/npobject_proxy.h"
+#include "content/child/npapi/npobject_proxy.h"
 
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/plugin_host.h"
 #include "content/child/npapi/plugin_instance.h"
-#include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 
diff --git a/content/child/npobject_proxy.h b/content/child/npapi/npobject_proxy.h
index 137c090..7462531 100644
--- a/content/child/npobject_proxy.h
+++ b/content/child/npapi/npobject_proxy.h
@@ -5,11 +5,11 @@
 // A proxy for NPObject that sends all calls to the object to an NPObjectStub
 // running in a different process.
 
-#ifndef CONTENT_CHILD_NPOBJECT_PROXY_H_
-#define CONTENT_CHILD_NPOBJECT_PROXY_H_
+#ifndef CONTENT_CHILD_NPAPI_NPOBJECT_PROXY_H_
+#define CONTENT_CHILD_NPAPI_NPOBJECT_PROXY_H_
 
 #include "base/memory/ref_counted.h"
-#include "content/child/npobject_base.h"
+#include "content/child/npapi/npobject_base.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ -125,4 +125,4 @@ class NPObjectProxy : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NPOBJECT_PROXY_H_
+#endif  // CONTENT_CHILD_NPAPI_NPOBJECT_PROXY_H_
diff --git a/content/child/npobject_stub.cc b/content/child/npapi/npobject_stub.cc
index 87bd8cc..739c0b5 100644
--- a/content/child/npobject_stub.cc
+++ b/content/child/npapi/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/child/npobject_stub.h"
+#include "content/child/npapi/npobject_stub.h"
 
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/plugin_host.h"
-#include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/child/npobject_stub.h b/content/child/npapi/npobject_stub.h
index a8da2bf..d73c27d 100644
--- a/content/child/npobject_stub.h
+++ b/content/child/npapi/npobject_stub.h
@@ -5,14 +5,14 @@
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
-#ifndef CONTENT_CHILD_NPOBJECT_STUB_H_
-#define CONTENT_CHILD_NPOBJECT_STUB_H_
+#ifndef CONTENT_CHILD_NPAPI_NPOBJECT_STUB_H_
+#define CONTENT_CHILD_NPAPI_NPOBJECT_STUB_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "content/child/npobject_base.h"
+#include "content/child/npapi/npobject_base.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "url/gurl.h"
@@ -96,4 +96,4 @@ class NPObjectStub : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NPOBJECT_STUB_H_
+#endif  // CONTENT_CHILD_NPAPI_NPOBJECT_STUB_H_
diff --git a/content/child/npobject_util.cc b/content/child/npapi/npobject_util.cc
index e05e736..fe7d365 100644
--- a/content/child/npobject_util.cc
+++ b/content/child/npapi/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/child/npobject_util.h"
+#include "content/child/npapi/npobject_util.h"
 
 #include "base/strings/string_util.h"
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
+#include "content/child/npapi/npobject_proxy.h"
 #include "content/child/npapi/plugin_host.h"
-#include "content/child/npobject_proxy.h"
 #include "content/child/plugin_messages.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/npapi/bindings/nphostapi.h"
diff --git a/content/child/npobject_util.h b/content/child/npapi/npobject_util.h
index bbf52e8..511a7cf 100644
--- a/content/child/npobject_util.h
+++ b/content/child/npapi/npobject_util.h
@@ -4,8 +4,8 @@
 //
 // Helper functions that are used by the NPObject proxy and stub.
 
-#ifndef CONTENT_CHILD_NPOBJECT_UTIL_H_
-#define CONTENT_CHILD_NPOBJECT_UTIL_H_
+#ifndef CONTENT_NPAPI_CHILD_NPOBJECT_UTIL_H_
+#define CONTENT_NPAPI_CHILD_NPOBJECT_UTIL_H_
 
 #include "build/build_config.h"
 
@@ -13,7 +13,7 @@
 #include <windows.h>
 #endif
 
-#include "content/child/npobject_stub.h"
+#include "content/child/npapi/npobject_stub.h"
 
 class GURL;
 
@@ -71,4 +71,4 @@ HANDLE GetMessageBoxEvent(HWND hwnd);
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NPOBJECT_UTIL_H_
+#endif  // CONTENT_NPAPI_CHILD_NPOBJECT_UTIL_H_
diff --git a/content/child/npruntime_util.cc b/content/child/npapi/npruntime_util.cc
index d8f4404..745406a 100644
--- a/content/child/npruntime_util.cc
+++ b/content/child/npapi/npruntime_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/child/npruntime_util.h"
+#include "content/child/npapi/npruntime_util.h"
 
 #include "base/pickle.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
diff --git a/content/child/npruntime_util.h b/content/child/npapi/npruntime_util.h
index b9abc238..8d02b8e 100644
--- a/content/child/npruntime_util.h
+++ b/content/child/npapi/npruntime_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_CHILD_NPRUNTIME_UTIL_H_
-#define CONTENT_CHILD_NPRUNTIME_UTIL_H_
+#ifndef CONTENT_CHILD_NPAPI_NPRUNTIME_UTIL_H_
+#define CONTENT_CHILD_NPAPI_NPRUNTIME_UTIL_H_
 
 #include "third_party/npapi/bindings/npruntime.h"
 
@@ -19,5 +19,4 @@ bool DeserializeNPIdentifier(PickleIterator* pickle_iter,
 
 }  // namespace content
 
-#endif  // CONTENT_CHILD_NPRUNTIME_UTIL_H_
-
+#endif  // CONTENT_CHILD_NPAPI_NPRUNTIME_UTIL_H_
diff --git a/content/child/plugin_param_traits.cc b/content/child/plugin_param_traits.cc
index 65e84f3..255369a 100644
--- a/content/child/plugin_param_traits.cc
+++ b/content/child/plugin_param_traits.cc
@@ -6,7 +6,6 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "content/child/npapi/plugin_host.h"
-#include "content/child/npruntime_util.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 
diff --git a/content/child/plugin_param_traits.h b/content/child/plugin_param_traits.h
index 6abd447..a83ae10 100644
--- a/content/child/plugin_param_traits.h
+++ b/content/child/plugin_param_traits.h
@@ -15,7 +15,8 @@
 #define CONTENT_CHILD_PLUGIN_PARAM_TRAITS_H_
 
 #include <string>
-#include "content/child/npruntime_util.h"
+
+#include "content/child/npapi/npruntime_util.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_param_traits.h"
 
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 062bbb5..c2cef48 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -55,6 +55,17 @@
     'child/indexed_db/proxy_webidbdatabase_impl.h',
     'child/indexed_db/proxy_webidbfactory_impl.cc',
     'child/indexed_db/proxy_webidbfactory_impl.h',
+    'child/npapi/np_channel_base.cc',
+    'child/npapi/np_channel_base.h',
+    'child/npapi/npobject_base.h',
+    'child/npapi/npobject_proxy.cc',
+    'child/npapi/npobject_proxy.h',
+    'child/npapi/npruntime_util.cc',
+    'child/npapi/npruntime_util.h',
+    'child/npapi/npobject_stub.cc',
+    'child/npapi/npobject_stub.h',
+    'child/npapi/npobject_util.cc',
+    'child/npapi/npobject_util.h',
     'child/npapi/plugin_host.cc',
     'child/npapi/plugin_host.h',
     'child/npapi/plugin_instance.cc',
@@ -84,17 +95,6 @@
     'child/npapi/webplugin_delegate_impl_win.cc',
     'child/npapi/webplugin_ime_win.cc',
     'child/npapi/webplugin_ime_win.h',
-    'child/np_channel_base.cc',
-    'child/np_channel_base.h',
-    'child/npobject_base.h',
-    'child/npobject_proxy.cc',
-    'child/npobject_proxy.h',
-    'child/npruntime_util.cc',
-    'child/npruntime_util.h',
-    'child/npobject_stub.cc',
-    'child/npobject_stub.h',
-    'child/npobject_util.cc',
-    'child/npobject_util.h',
     'child/plugin_message_generator.cc',
     'child/plugin_message_generator.h',
     'child/plugin_messages.h',
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index 581a3ee..a5844e3 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/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 
 namespace base {
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 19f170a..2035c35 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -21,9 +21,9 @@
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_process.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/plugin_lib.h"
 #include "content/child/npapi/webplugin_delegate_impl.h"
-#include "content/child/npobject_util.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index 2eb346005..5efb58e 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/child/npobject_stub.h"
+#include "content/child/npapi/npobject_stub.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/npapi/bindings/npapi.h"
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index ba2524c..f411f30 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/memory/shared_memory.h"
 #include "build/build_config.h"
+#include "content/child/npapi/npobject_proxy.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/webplugin_delegate_impl.h"
-#include "content/child/npobject_proxy.h"
-#include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
diff --git a/content/renderer/java/java_bridge_channel.h b/content/renderer/java/java_bridge_channel.h
index 324a3a2..a947374 100644
--- a/content/renderer/java/java_bridge_channel.h
+++ b/content/renderer/java/java_bridge_channel.h
@@ -6,7 +6,7 @@
 #define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 #include "ipc/ipc_channel_handle.h"
 
 namespace content {
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
index c0b5994..376ecb1 100644
--- a/content/renderer/java/java_bridge_dispatcher.cc
+++ b/content/renderer/java/java_bridge_dispatcher.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/java/java_bridge_dispatcher.h"
 
 #include "content/child/child_process.h"
-#include "content/child/npobject_util.h"  // For CreateNPVariant()
+#include "content/child/npapi/npobject_util.h"  // For CreateNPVariant()
 #include "content/common/java_bridge_messages.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc
index bf59f4c..4de56b6 100644
--- a/content/renderer/plugin_channel_host.cc
+++ b/content/renderer/plugin_channel_host.cc
@@ -7,7 +7,7 @@
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/child/child_process.h"
-#include "content/child/npobject_base.h"
+#include "content/child/npapi/npobject_base.h"
 #include "content/child/plugin_messages.h"
 
 #if defined(OS_POSIX)
diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h
index bf2a861..f8ae6d3 100644
--- a/content/renderer/plugin_channel_host.h
+++ b/content/renderer/plugin_channel_host.h
@@ -6,7 +6,7 @@
 #define CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_
 
 #include "base/containers/hash_tables.h"
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 #include "ipc/ipc_channel_handle.h"
 
 namespace content {
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 0a2e1d0..18218a7 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -31,7 +31,7 @@
 #include "content/child/db_message_filter.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_message_filter.h"
-#include "content/child/npobject_util.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/child/runtime_features.h"
@@ -116,7 +116,7 @@
 #else
 // TODO(port)
 #include "base/memory/scoped_handle.h"
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
 #endif
 
 #if defined(OS_POSIX)
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index a147108..9af5a14 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -16,7 +16,7 @@
 #include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
-#include "content/child/npobject_util.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webblobregistry_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 2fa7066..39972ab 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -25,10 +25,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "content/child/child_process.h"
+#include "content/child/npapi/npobject_proxy.h"
+#include "content/child/npapi/npobject_stub.h"
+#include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/webplugin.h"
-#include "content/child/npobject_proxy.h"
-#include "content/child/npobject_stub.h"
-#include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"