37 files changed, 151 insertions, 162 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e2524d3..8d5869b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -544,68 +544,6 @@
       ],
     },
     {
-      'target_name': 'plugin',
-      'type': '<(library)',
-      'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A',
-      'dependencies': [
-        'common',
-        'chrome_resources',
-        'chrome_strings',
-        '../media/media.gyp:media',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/npapi/npapi.gyp:npapi',
-        '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/support/webkit_support.gyp:glue',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-      ],
-      'sources': [
-        # All .cc, .h, .m, and .mm files under plugins except for tests and
-        # mocks.
-        'plugin/npobject_base.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_channel_base.cc',
-        'plugin/plugin_channel_base.h',
-        'plugin/plugin_interpose_util_mac.mm',
-        'plugin/plugin_interpose_util_mac.h',
-        'plugin/plugin_main.cc',
-        'plugin/plugin_main_linux.cc',
-        'plugin/plugin_main_mac.mm',
-        'plugin/plugin_thread.cc',
-        'plugin/plugin_thread.h',
-        'plugin/webplugin_accelerated_surface_proxy_mac.cc',
-        'plugin/webplugin_accelerated_surface_proxy_mac.h',
-        'plugin/webplugin_delegate_stub.cc',
-        'plugin/webplugin_delegate_stub.h',
-        'plugin/webplugin_proxy.cc',
-        'plugin/webplugin_proxy.h',
-      ],
-      # These are layered in conditionals in the event other platforms
-      # end up using this module as well.
-      'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'utility',
       'type': '<(library)',
       'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 149232a..12f0538 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -11,10 +11,10 @@
       'dependencies': [
         'common',
         'common_net',
-        'plugin',
         'chrome_resources',
         'chrome_strings',
         'safe_browsing_proto',
+        '../content/content.gyp:content_plugin',
         '../ppapi/ppapi.gyp:ppapi_proxy',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c41abc7..202fe80 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3060,15 +3060,6 @@
         'test/data/resource.rc',
       ],
       'conditions': [
-        # Plugin code.
-        ['OS=="linux" or OS=="win"', {
-          'dependencies': [
-            'plugin',
-           ],
-          'export_dependent_settings': [
-            'plugin',
-          ],
-        }],
         ['OS=="linux"', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc
index 4573dfb..09bbbfe 100644
--- a/chrome/common/common_glue.cc
+++ b/chrome/common/common_glue.cc
@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/plugin/npobject_util.h"
+#include "content/plugin/npobject_util.h"
 #include "googleurl/src/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
diff --git a/chrome/renderer/plugin_channel_host.cc b/chrome/renderer/plugin_channel_host.cc
index 7e2a932..4112c46 100644
--- a/chrome/renderer/plugin_channel_host.cc
+++ b/chrome/renderer/plugin_channel_host.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/renderer/plugin_channel_host.h"
 
-#include "chrome/plugin/npobject_base.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/npobject_base.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
diff --git a/chrome/renderer/plugin_channel_host.h b/chrome/renderer/plugin_channel_host.h
index 5f6d556..247794e 100644
--- a/chrome/renderer/plugin_channel_host.h
+++ b/chrome/renderer/plugin_channel_host.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/hash_tables.h"
-#include "chrome/plugin/plugin_channel_base.h"
+#include "content/plugin/plugin_channel_base.h"
 #include "ipc/ipc_channel_handle.h"
 
 class IsListeningFilter;
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index d775154..ac1fe0f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -32,7 +32,6 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/automation/dom_automation_v8_extension.h"
 #include "chrome/renderer/cookie_message_filter.h"
 #include "chrome/renderer/devtools_agent_filter.h"
@@ -69,6 +68,7 @@
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/web_database_observer_impl.h"
+#include "content/plugin/npobject_util.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_errors.h"
@@ -96,10 +96,10 @@
 
 // TODO(port)
 #if defined(OS_WIN)
-#include "chrome/plugin/plugin_channel.h"
+#include "content/plugin/plugin_channel.h"
 #else
 #include "base/scoped_handle.h"
-#include "chrome/plugin/plugin_channel_base.h"
+#include "content/plugin/plugin_channel_base.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 5cabf27..9328c69 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -21,11 +21,11 @@
 #include "chrome/common/clipboard_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/socket_stream_dispatcher.h"
+#include "content/plugin/npobject_util.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 6f1c0ef1..8745f63 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -11,7 +11,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
@@ -27,6 +26,7 @@
 #include "content/common/mime_registry_messages.h"
 #include "content/common/webblobregistry_impl.h"
 #include "content/common/webmessageportchannel_impl.h"
+#include "content/plugin/npobject_util.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 0d1ac5b..273f591 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -22,14 +22,14 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/plugin/npobject_proxy.h"
-#include "chrome/plugin/npobject_stub.h"
-#include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/npobject_proxy.h"
+#include "content/plugin/npobject_stub.h"
+#include "content/plugin/npobject_util.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/content.gyp b/content/content.gyp
index 62c12eb..42c050b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -10,6 +10,7 @@
     'content_browser.gypi',
     'content_common.gypi',
     'content_gpu.gypi',
+    'content_plugin.gypi',
     'content_ppapi_plugin.gypi',
     'content_worker.gypi',
   ],
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
new file mode 100644
index 0000000..8886a04
--- /dev/null
+++ b/content/content_plugin.gypi
@@ -0,0 +1,64 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'content_plugin',
+      'type': '<(library)',
+      'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A',
+      'dependencies': [
+        'content_common',
+        '../skia/skia.gyp:skia',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../webkit/support/webkit_support.gyp:glue',
+      ],
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
+      ],
+      'sources': [
+        # All .cc, .h, .m, and .mm files under plugins except for tests and
+        # mocks.
+        'plugin/npobject_base.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_channel_base.cc',
+        'plugin/plugin_channel_base.h',
+        'plugin/plugin_interpose_util_mac.mm',
+        'plugin/plugin_interpose_util_mac.h',
+        'plugin/plugin_main.cc',
+        'plugin/plugin_main_linux.cc',
+        'plugin/plugin_main_mac.mm',
+        'plugin/plugin_thread.cc',
+        'plugin/plugin_thread.h',
+        'plugin/webplugin_accelerated_surface_proxy_mac.cc',
+        'plugin/webplugin_accelerated_surface_proxy_mac.h',
+        'plugin/webplugin_delegate_stub.cc',
+        'plugin/webplugin_delegate_stub.h',
+        'plugin/webplugin_proxy.cc',
+        'plugin/webplugin_proxy.h',
+      ],
+      # These are layered in conditionals in the event other platforms
+      # end up using this module as well.
+      'conditions': [
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+        }],
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/chrome/plugin/DEPS b/content/plugin/DEPS
index 15434bf..5868246 100644
--- a/chrome/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -1,11 +1,8 @@
 include_rules = [
-  "+chrome/app",
-  "+chrome/renderer",
   "+sandbox/src",
   "+skia/ext",
   "+third_party/npapi",
   "+webkit/glue",
   "+webkit/plugins",
-  "+grit",  # For generated headers
 ]
 
diff --git a/chrome/plugin/npobject_base.h b/content/plugin/npobject_base.h
index 757fa12..fc6117a 100644
--- a/chrome/plugin/npobject_base.h
+++ b/content/plugin/npobject_base.h
@@ -4,8 +4,8 @@
 //
 // Base interface implemented by NPObjectProxy and NPObjectStub
 
-#ifndef CHROME_PLUGIN_NPOBJECT_BASE_H_
-#define CHROME_PLUGIN_NPOBJECT_BASE_H_
+#ifndef CONTENT_PLUGIN_NPOBJECT_BASE_H_
+#define CONTENT_PLUGIN_NPOBJECT_BASE_H_
 #pragma once
 
 #include "ipc/ipc_channel.h"
@@ -24,5 +24,4 @@ class NPObjectBase {
   virtual IPC::Channel::Listener* GetChannelListener() = 0;
 };
 
-#endif  // CHROME_PLUGIN_NPOBJECT_BASE_H_
-
+#endif  // CONTENT_PLUGIN_NPOBJECT_BASE_H_
diff --git a/chrome/plugin/npobject_proxy.cc b/content/plugin/npobject_proxy.cc
index 31f4657..5c08724 100644
--- a/chrome/plugin/npobject_proxy.cc
+++ b/content/plugin/npobject_proxy.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 "chrome/plugin/npobject_proxy.h"
+#include "content/plugin/npobject_proxy.h"
 
-#include "chrome/plugin/npobject_util.h"
-#include "chrome/plugin/plugin_channel.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"
 #include "webkit/plugins/npapi/plugin_instance.h"
diff --git a/chrome/plugin/npobject_proxy.h b/content/plugin/npobject_proxy.h
index 253eb14..39996de 100644
--- a/chrome/plugin/npobject_proxy.h
+++ b/content/plugin/npobject_proxy.h
@@ -5,12 +5,12 @@
 // A proxy for NPObject that sends all calls to the object to an NPObjectStub
 // running in a different process.
 
-#ifndef CHROME_PLUGIN_NPOBJECT_PROXY_H_
-#define CHROME_PLUGIN_NPOBJECT_PROXY_H_
+#ifndef CONTENT_PLUGIN_NPOBJECT_PROXY_H_
+#define CONTENT_PLUGIN_NPOBJECT_PROXY_H_
 #pragma once
 
 #include "base/ref_counted.h"
-#include "chrome/plugin/npobject_base.h"
+#include "content/plugin/npobject_base.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ -120,4 +120,4 @@ class NPObjectProxy : public IPC::Channel::Listener,
   GURL page_url_;
 };
 
-#endif  // CHROME_PLUGIN_NPOBJECT_PROXY_H_
+#endif  // CONTENT_PLUGIN_NPOBJECT_PROXY_H_
diff --git a/chrome/plugin/npobject_stub.cc b/content/plugin/npobject_stub.cc
index eae17b6..e7402a8 100644
--- a/chrome/plugin/npobject_stub.cc
+++ b/content/plugin/npobject_stub.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/plugin/npobject_stub.h"
+#include "content/plugin/npobject_stub.h"
 
-#include "chrome/plugin/npobject_util.h"
-#include "chrome/plugin/plugin_channel_base.h"
-#include "chrome/plugin/plugin_thread.h"
 #include "content/common/content_client.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/npobject_util.h"
+#include "content/plugin/plugin_channel_base.h"
+#include "content/plugin/plugin_thread.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
diff --git a/chrome/plugin/npobject_stub.h b/content/plugin/npobject_stub.h
index 708648a..a7637d66 100644
--- a/chrome/plugin/npobject_stub.h
+++ b/content/plugin/npobject_stub.h
@@ -5,15 +5,15 @@
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
-#ifndef CHROME_PLUGIN_NPOBJECT_STUB_H_
-#define CHROME_PLUGIN_NPOBJECT_STUB_H_
+#ifndef CONTENT_PLUGIN_NPOBJECT_STUB_H_
+#define CONTENT_PLUGIN_NPOBJECT_STUB_H_
 #pragma once
 
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
-#include "chrome/plugin/npobject_base.h"
+#include "content/plugin/npobject_base.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "ui/gfx/native_widget_types.h"
@@ -92,4 +92,4 @@ class NPObjectStub : public IPC::Channel::Listener,
   GURL page_url_;
 };
 
-#endif  // CHROME_PLUGIN_NPOBJECT_STUB_H_
+#endif  // CONTENT_PLUGIN_NPOBJECT_STUB_H_
diff --git a/chrome/plugin/npobject_util.cc b/content/plugin/npobject_util.cc
index 8e401b0..c9a2a68 100644
--- a/chrome/plugin/npobject_util.cc
+++ b/content/plugin/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 "chrome/plugin/npobject_util.h"
+#include "content/plugin/npobject_util.h"
 
 #include "base/string_util.h"
-#include "chrome/plugin/npobject_proxy.h"
-#include "chrome/plugin/plugin_channel_base.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/npobject_proxy.h"
+#include "content/plugin/plugin_channel_base.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/chrome/plugin/npobject_util.h b/content/plugin/npobject_util.h
index ef68b6e..cca210d 100644
--- a/chrome/plugin/npobject_util.h
+++ b/content/plugin/npobject_util.h
@@ -4,8 +4,8 @@
 //
 // Helper functions that are used by the NPObject proxy and stub.
 
-#ifndef CHROME_PLUGIN_NPOBJECT_UTIL_H__
-#define CHROME_PLUGIN_NPOBJECT_UTIL_H__
+#ifndef CONTENT_PLUGIN_NPOBJECT_UTIL_H_
+#define CONTENT_PLUGIN_NPOBJECT_UTIL_H_
 #pragma once
 
 #include "build/build_config.h"
@@ -14,7 +14,7 @@
 #include <windows.h>
 #endif
 
-#include "chrome/plugin/npobject_stub.h"
+#include "content/plugin/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  // CHROME_PLUGIN_NPOBJECT_UTIL_H__
+#endif  // CONTENT_PLUGIN_NPOBJECT_UTIL_H_
diff --git a/chrome/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index 10151ad..8d90601 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.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 "chrome/plugin/plugin_channel.h"
+#include "content/plugin/plugin_channel.h"
 
 #include "base/command_line.h"
 #include "base/process_util.h"
@@ -10,12 +10,12 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
-#include "chrome/plugin/plugin_thread.h"
-#include "chrome/plugin/webplugin_delegate_stub.h"
-#include "chrome/plugin/webplugin_proxy.h"
 #include "content/common/child_process.h"
 #include "content/common/content_switches.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/plugin_thread.h"
+#include "content/plugin/webplugin_delegate_stub.h"
+#include "content/plugin/webplugin_proxy.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 
 #if defined(OS_POSIX)
diff --git a/chrome/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index b2a3add..6b1d278 100644
--- a/chrome/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_PLUGIN_PLUGIN_CHANNEL_H_
-#define CHROME_PLUGIN_PLUGIN_CHANNEL_H_
+#ifndef CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
+#define CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
 #pragma once
 
 #include <vector>
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "build/build_config.h"
-#include "chrome/plugin/plugin_channel_base.h"
-#include "chrome/plugin/webplugin_delegate_stub.h"
+#include "content/plugin/plugin_channel_base.h"
+#include "content/plugin/webplugin_delegate_stub.h"
 
 namespace base {
 class WaitableEvent;
@@ -96,4 +96,4 @@ class PluginChannel : public PluginChannelBase {
   DISALLOW_COPY_AND_ASSIGN(PluginChannel);
 };
 
-#endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_H_
+#endif  // CONTENT_PLUGIN_PLUGIN_CHANNEL_H_
diff --git a/chrome/plugin/plugin_channel_base.cc b/content/plugin/plugin_channel_base.cc
index df09e39..d78d48c 100644
--- a/chrome/plugin/plugin_channel_base.cc
+++ b/content/plugin/plugin_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 "chrome/plugin/plugin_channel_base.h"
+#include "content/plugin/plugin_channel_base.h"
 
 #include <stack>
 
diff --git a/chrome/plugin/plugin_channel_base.h b/content/plugin/plugin_channel_base.h
index 9368508..8d3cbc5 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/content/plugin/plugin_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 CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
-#define CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
+#ifndef CONTENT_PLUGIN_PLUGIN_CHANNEL_BASE_H_
+#define CONTENT_PLUGIN_PLUGIN_CHANNEL_BASE_H_
 #pragma once
 
 #include <string>
@@ -13,8 +13,8 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "chrome/plugin/npobject_base.h"
 #include "content/common/message_router.h"
+#include "content/plugin/npobject_base.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
@@ -146,4 +146,4 @@ class PluginChannelBase : public IPC::Channel::Listener,
   DISALLOW_COPY_AND_ASSIGN(PluginChannelBase);
 };
 
-#endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
+#endif  // CONTENT_PLUGIN_PLUGIN_CHANNEL_BASE_H_
diff --git a/chrome/plugin/plugin_interpose_util_mac.h b/content/plugin/plugin_interpose_util_mac.h
index 879fc65..2a715ba 100644
--- a/chrome/plugin/plugin_interpose_util_mac.h
+++ b/content/plugin/plugin_interpose_util_mac.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 CHROME_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
-#define CHROME_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
+#ifndef CONTENT_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
+#define CONTENT_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
 #pragma once
 
 #include <Carbon/Carbon.h>
@@ -54,4 +54,4 @@ bool GetPluginWindowHasFocus(const OpaquePluginRef delegate);
 
 }  // namespace MacPluginInterpose
 
-#endif  // CHROME_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
+#endif  // CONTENT_PLUGIN_PLUGIN_INTERPOSE_UTIL_MAC_H_
diff --git a/chrome/plugin/plugin_interpose_util_mac.mm b/content/plugin/plugin_interpose_util_mac.mm
index 625fc0b..e1cd5bd 100644
--- a/chrome/plugin/plugin_interpose_util_mac.mm
+++ b/content/plugin/plugin_interpose_util_mac.mm
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/plugin/plugin_interpose_util_mac.h"
+#include "content/plugin/plugin_interpose_util_mac.h"
 
 #import <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
-#include "chrome/plugin/plugin_thread.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/plugin_thread.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 namespace mac_plugin_interposing {
diff --git a/chrome/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 4ec2c08..fef3e95 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -13,11 +13,11 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/plugin/plugin_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/content_switches.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
+#include "content/plugin/plugin_thread.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/plugin/plugin_main_linux.cc b/content/plugin/plugin_main_linux.cc
index 6bb9da7..6bb9da7 100644
--- a/chrome/plugin/plugin_main_linux.cc
+++ b/content/plugin/plugin_main_linux.cc
diff --git a/chrome/plugin/plugin_main_mac.mm b/content/plugin/plugin_main_mac.mm
index 22283d83..15f230c 100644
--- a/chrome/plugin/plugin_main_mac.mm
+++ b/content/plugin/plugin_main_mac.mm
@@ -5,9 +5,9 @@
 #include "base/environment.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "chrome/plugin/plugin_interpose_util_mac.h"
 #include "content/common/chrome_application_mac.h"
 #include "content/common/plugin_carbon_interpose_constants_mac.h"
+#include "content/plugin/plugin_interpose_util_mac.h"
 
 #if !defined(__LP64__)
 void TrimInterposeEnvironment() {
diff --git a/chrome/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index d0692c8..c2ca935 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.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 "chrome/plugin/plugin_thread.h"
+#include "content/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
@@ -19,13 +19,12 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
-#include "chrome/plugin/npobject_util.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/plugin_messages.h"
+#include "content/plugin/npobject_util.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/chrome/plugin/plugin_thread.h b/content/plugin/plugin_thread.h
index 9e6baa8..efd96b6 100644
--- a/chrome/plugin/plugin_thread.h
+++ b/content/plugin/plugin_thread.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_PLUGIN_PLUGIN_THREAD_H_
-#define CHROME_PLUGIN_PLUGIN_THREAD_H_
+#ifndef CONTENT_PLUGIN_PLUGIN_THREAD_H_
+#define CONTENT_PLUGIN_PLUGIN_THREAD_H_
 #pragma once
 
 #include "base/file_path.h"
 #include "base/native_library.h"
 #include "build/build_config.h"
-#include "chrome/plugin/plugin_channel.h"
 #include "content/common/child_thread.h"
+#include "content/plugin/plugin_channel.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 
 #if defined(OS_POSIX)
@@ -51,4 +51,4 @@ class PluginThread : public ChildThread {
   DISALLOW_COPY_AND_ASSIGN(PluginThread);
 };
 
-#endif  // CHROME_PLUGIN_PLUGIN_THREAD_H_
+#endif  // CONTENT_PLUGIN_PLUGIN_THREAD_H_
diff --git a/chrome/plugin/webplugin_accelerated_surface_proxy_mac.cc b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
index 9dcacb9..7f5d486 100644
--- a/chrome/plugin/webplugin_accelerated_surface_proxy_mac.cc
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
@@ -4,11 +4,11 @@
 
 #import <OpenGL/OpenGL.h>
 
-#include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h"
+#include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 
 #include "app/surface/accelerated_surface_mac.h"
 #include "app/surface/transport_dib.h"
-#include "chrome/plugin/webplugin_proxy.h"
+#include "content/plugin/webplugin_proxy.h"
 
 WebPluginAcceleratedSurfaceProxy::WebPluginAcceleratedSurfaceProxy(
     WebPluginProxy* plugin_proxy)
diff --git a/chrome/plugin/webplugin_accelerated_surface_proxy_mac.h b/content/plugin/webplugin_accelerated_surface_proxy_mac.h
index ee4df63..b41239f 100644
--- a/chrome/plugin/webplugin_accelerated_surface_proxy_mac.h
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.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 CHROME_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
-#define CHROME_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
+#ifndef CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
+#define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
 #pragma once
 
 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
@@ -36,4 +36,4 @@ class WebPluginAcceleratedSurfaceProxy
   DISALLOW_COPY_AND_ASSIGN(WebPluginAcceleratedSurfaceProxy);
 };
 
-#endif  // CHROME_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
+#endif  // CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index b87fe22..cf26fc0 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/plugin/webplugin_delegate_stub.h"
+#include "content/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/command_line.h"
-#include "chrome/plugin/npobject_stub.h"
-#include "chrome/plugin/plugin_channel.h"
-#include "chrome/plugin/plugin_thread.h"
-#include "chrome/plugin/webplugin_proxy.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.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"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "skia/ext/platform_device.h"
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index b56bca7..74fd5bd 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.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 CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
-#define CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
+#ifndef CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
+#define CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #pragma once
 
 #include <string>
@@ -132,4 +132,4 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub);
 };
 
-#endif  // CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
+#endif  // CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
diff --git a/chrome/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 8b1be0f..57e61b2 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.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 "chrome/plugin/webplugin_proxy.h"
+#include "content/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
@@ -10,12 +10,12 @@
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
-#include "chrome/plugin/npobject_proxy.h"
-#include "chrome/plugin/npobject_util.h"
-#include "chrome/plugin/plugin_channel.h"
-#include "chrome/plugin/plugin_thread.h"
 #include "content/common/content_client.h"
 #include "content/common/plugin_messages.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_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "ui/gfx/blit.h"
@@ -25,7 +25,7 @@
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h"
+#include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 4b3f2b4..8dbfa9e 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.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 CHROME_PLUGIN_WEBPLUGIN_PROXY_H_
-#define CHROME_PLUGIN_WEBPLUGIN_PROXY_H_
+#ifndef CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
+#define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 #pragma once
 
 #include <string>
@@ -222,4 +222,4 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
   ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_;
 };
 
-#endif  // CHROME_PLUGIN_WEBPLUGIN_PROXY_H_
+#endif  // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_