Move NPAPI test plugin to content/test/plugin.

BUG=237249
R=scottmg@chromium.org

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

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

60 files changed, 309 insertions, 321 deletions

diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 93a3fc9..9eb3dea 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -116,7 +116,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/webplugininfo.h"
 
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index db5315b..9627660 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2053,8 +2053,8 @@
           # npapi test plugin doesn't build on android or ios
           'dependencies': [
             # build time dependency.
+            '../content/content.gyp:copy_npapi_test_plugin',
             '../v8/tools/gyp/v8.gyp:v8_shell#host',
-            '../webkit/plugins/webkit_plugins.gyp:copy_npapi_test_plugin',
           ],
         }],
         ['enable_app_list==0', {
diff --git a/content/child/npapi/plugin_stream_url.h b/content/child/npapi/plugin_stream_url.h
index 7787642..2e3dc2b 100644
--- a/content/child/npapi/plugin_stream_url.h
+++ b/content/child/npapi/plugin_stream_url.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 WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
+#ifndef CONTENT_CHILD_NPAPI_PLUGIN_STREAM_URL_H_
+#define CONTENT_CHILD_NPAPI_PLUGIN_STREAM_URL_H_
 
 #include <vector>
 
@@ -69,4 +69,4 @@ class PluginStreamUrl : public PluginStream,
 
 }  // namespace content
 
-#endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
+#endif // CONTENT_CHILD_NPAPI_PLUGIN_STREAM_URL_H_
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 28fa3f5..0ee2c85 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -961,7 +961,7 @@
               # npapi test plugin doesn't build on android or ios
               'dependencies': [
                 # Runtime dependencies
-                '../webkit/plugins/webkit_plugins.gyp:copy_npapi_test_plugin',
+                'copy_npapi_test_plugin',
               ],
             }],
             ['enable_webrtc==1', {
@@ -1253,5 +1253,149 @@
         },
       ],
     }],
+    ['OS!="android" and OS!="ios"', {
+      # npapi test plugin doesn't build on android or ios
+      'targets': [
+        {
+          'target_name': 'npapi_test_plugin',
+          'type': 'loadable_module',
+          'variables': {
+            'chromium_code': 1,
+          },
+          'mac_bundle': 1,
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+            '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+          ],
+          'sources': [
+            'test/plugin/npapi_constants.cc',
+            'test/plugin/npapi_constants.h',
+            'test/plugin/npapi_test.cc',
+            'test/plugin/npapi_test.def',
+            'test/plugin/npapi_test.rc',
+            'test/plugin/plugin_arguments_test.cc',
+            'test/plugin/plugin_arguments_test.h',
+            'test/plugin/plugin_client.cc',
+            'test/plugin/plugin_client.h',
+            'test/plugin/plugin_create_instance_in_paint.cc',
+            'test/plugin/plugin_create_instance_in_paint.h',
+            'test/plugin/plugin_delete_plugin_in_deallocate_test.cc',
+            'test/plugin/plugin_delete_plugin_in_deallocate_test.h',
+            'test/plugin/plugin_delete_plugin_in_stream_test.cc',
+            'test/plugin/plugin_delete_plugin_in_stream_test.h',
+            'test/plugin/plugin_execute_stream_javascript.cc',
+            'test/plugin/plugin_execute_stream_javascript.h',
+            'test/plugin/plugin_get_javascript_url_test.cc',
+            'test/plugin/plugin_get_javascript_url_test.h',
+            'test/plugin/plugin_get_javascript_url2_test.cc',
+            'test/plugin/plugin_get_javascript_url2_test.h',
+            'test/plugin/plugin_geturl_test.cc',
+            'test/plugin/plugin_geturl_test.h',
+            'test/plugin/plugin_javascript_open_popup.cc',
+            'test/plugin/plugin_javascript_open_popup.h',
+            'test/plugin/plugin_new_fails_test.cc',
+            'test/plugin/plugin_new_fails_test.h',
+            'test/plugin/plugin_npobject_identity_test.cc',
+            'test/plugin/plugin_npobject_identity_test.h',
+            'test/plugin/plugin_npobject_lifetime_test.cc',
+            'test/plugin/plugin_npobject_lifetime_test.h',
+            'test/plugin/plugin_npobject_proxy_test.cc',
+            'test/plugin/plugin_npobject_proxy_test.h',
+            'test/plugin/plugin_request_read_test.h',
+            'test/plugin/plugin_request_read_test.cc',
+            'test/plugin/plugin_schedule_timer_test.cc',
+            'test/plugin/plugin_schedule_timer_test.h',
+            'test/plugin/plugin_setup_test.cc',
+            'test/plugin/plugin_setup_test.h',
+            'test/plugin/plugin_test.cc',
+            'test/plugin/plugin_test.h',
+            'test/plugin/plugin_test_factory.h',
+            'test/plugin/plugin_thread_async_call_test.cc',
+            'test/plugin/plugin_thread_async_call_test.h',
+            'test/plugin/plugin_windowed_test.cc',
+            'test/plugin/plugin_windowed_test.h',
+            'test/plugin/plugin_private_test.cc',
+            'test/plugin/plugin_private_test.h',
+            'test/plugin/plugin_test_factory.cc',
+            'test/plugin/plugin_window_size_test.cc',
+            'test/plugin/plugin_window_size_test.h',
+            'test/plugin/plugin_windowless_test.cc',
+            'test/plugin/plugin_windowless_test.h',
+            'test/plugin/resource.h',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': '<(DEPTH)/content/test/plugin/Info.plist',
+          },
+          'conditions': [
+            ['OS!="win"', {
+              'sources!': [
+                # TODO(port):  Port these.
+                # plugin_npobject_lifetime_test.cc has win32-isms
+                #   (HWND, CALLBACK).
+                'test/plugin/plugin_npobject_lifetime_test.cc',
+                 # The window APIs are necessarily platform-specific.
+                'test/plugin/plugin_window_size_test.cc',
+                'test/plugin/plugin_windowed_test.cc',
+                 # Seems windows specific.
+                'test/plugin/plugin_create_instance_in_paint.cc',
+                'test/plugin/plugin_create_instance_in_paint.h',
+                 # windows-specific resources
+                'test/plugin/npapi_test.def',
+                'test/plugin/npapi_test.rc',
+              ],
+            }],
+            ['OS=="mac"', {
+              'product_extension': 'plugin',
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                ],
+              },
+            }],
+            ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', {
+              # Shared libraries need -fPIC on x86-64
+              'cflags': ['-fPIC']
+            }],
+          ],
+        },
+        {
+          'target_name': 'copy_npapi_test_plugin',
+          'type': 'none',
+          'dependencies': [
+            'npapi_test_plugin',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins',
+                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'],
+                },
+              ],
+            }],
+            ['OS=="mac"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins/',
+                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'],
+                },
+              ]
+            }],
+            ['os_posix == 1 and OS != "mac"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins',
+                  'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
+                },
+              ],
+            }],
+          ],
+        },
+      ],
+    }],
   ],
 }
diff --git a/webkit/plugins/npapi/test/Info.plist b/content/test/plugin/Info.plist
index 37145fd..37145fd 100644
--- a/webkit/plugins/npapi/test/Info.plist
+++ b/content/test/plugin/Info.plist
diff --git a/webkit/plugins/npapi/test/npapi_constants.cc b/content/test/plugin/npapi_constants.cc
index 94d3284..7f517a2 100644
--- a/webkit/plugins/npapi/test/npapi_constants.cc
+++ b/content/test/plugin/npapi_constants.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 "webkit/plugins/npapi/test/npapi_constants.h"
+#include "content/test/plugin/npapi_constants.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/npapi_constants.h b/content/test/plugin/npapi_constants.h
index 2d375b0..986c046 100644
--- a/webkit/plugins/npapi/test/npapi_constants.h
+++ b/content/test/plugin/npapi_constants.h
@@ -4,8 +4,8 @@
 
 // Constants for the NPAPI test
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
+#ifndef CONTENT_TEST_PLUGIN_NPAPI_CONSTANTS_H_
+#define CONTENT_TEST_PLUGIN_NPAPI_CONSTANTS_H_
 
 namespace NPAPIClient {
 
@@ -19,4 +19,4 @@ extern const char kTestCompleteSuccess[];
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
+#endif  // CONTENT_TEST_PLUGIN_NPAPI_CONSTANTS_H_
diff --git a/webkit/plugins/npapi/test/npapi_test.cc b/content/test/plugin/npapi_test.cc
index 26dc45d..975de43 100644
--- a/webkit/plugins/npapi/test/npapi_test.cc
+++ b/content/test/plugin/npapi_test.cc
@@ -53,7 +53,7 @@
 #define EXPORT
 #endif
 
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 #if defined(OS_WIN)
 BOOL API_CALL DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) {
diff --git a/webkit/plugins/npapi/test/npapi_test.def b/content/test/plugin/npapi_test.def
index 4481c16..4481c16 100644
--- a/webkit/plugins/npapi/test/npapi_test.def
+++ b/content/test/plugin/npapi_test.def
diff --git a/webkit/plugins/npapi/test/npapi_test.rc b/content/test/plugin/npapi_test.rc
index d877b10..d877b10 100644
--- a/webkit/plugins/npapi/test/npapi_test.rc
+++ b/content/test/plugin/npapi_test.rc
diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.cc b/content/test/plugin/plugin_arguments_test.cc
index bde0972..63ac3b8 100644
--- a/webkit/plugins/npapi/test/plugin_arguments_test.cc
+++ b/content/test/plugin/plugin_arguments_test.cc
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "webkit/plugins/npapi/test/plugin_arguments_test.h"
+#include "content/test/plugin/plugin_arguments_test.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
diff --git a/webkit/plugins/npapi/test/plugin_arguments_test.h b/content/test/plugin/plugin_arguments_test.h
index 0904d49..7241b76 100644
--- a/webkit/plugins/npapi/test/plugin_arguments_test.h
+++ b/content/test/plugin/plugin_arguments_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_ARGUMENTS_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_ARGUMENTS_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -41,4 +41,4 @@ class PluginArgumentsTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_ARGUMENTS_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/content/test/plugin/plugin_client.cc
index 123da9c..3410a66 100644
--- a/webkit/plugins/npapi/test/plugin_client.cc
+++ b/content/test/plugin/plugin_client.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 "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 #include "base/strings/string_util.h"
-#include "webkit/plugins/npapi/test/plugin_execute_stream_javascript.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
-#include "webkit/plugins/npapi/test/plugin_test_factory.h"
+#include "content/test/plugin/plugin_execute_stream_javascript.h"
+#include "content/test/plugin/plugin_test.h"
+#include "content/test/plugin/plugin_test_factory.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_client.h b/content/test/plugin/plugin_client.h
index c06be2d..07d9a70 100644
--- a/webkit/plugins/npapi/test/plugin_client.h
+++ b/content/test/plugin/plugin_client.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 WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_CLIENT_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_CLIENT_H_
 
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
@@ -42,4 +42,4 @@ class PluginClient {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_CLIENT_H_
diff --git a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc b/content/test/plugin/plugin_create_instance_in_paint.cc
index e045ba0..4aa69e4 100644
--- a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.cc
+++ b/content/test/plugin/plugin_create_instance_in_paint.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 "webkit/plugins/npapi/test/plugin_create_instance_in_paint.h"
+#include "content/test/plugin/plugin_create_instance_in_paint.h"
 
 #include "base/logging.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h b/content/test/plugin/plugin_create_instance_in_paint.h
index 59f196f..fa0d69f 100644
--- a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h
+++ b/content/test/plugin/plugin_create_instance_in_paint.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -30,4 +30,4 @@ class CreateInstanceInPaintTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.cc b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.cc
index f0c6b5c..733107d 100644
--- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.cc
+++ b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.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 "webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h"
+#include "content/test/plugin/plugin_delete_plugin_in_deallocate_test.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h
index af1ce74..d04fd00 100644
--- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h
+++ b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h
@@ -1,11 +1,12 @@
 // 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.
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
+
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -28,4 +29,4 @@ class DeletePluginInDeallocateTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_DEALLOCATE_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc b/content/test/plugin/plugin_delete_plugin_in_stream_test.cc
index 9b76352..edb2bbe 100644
--- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc
+++ b/content/test/plugin/plugin_delete_plugin_in_stream_test.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h"
+#include "content/test/plugin/plugin_delete_plugin_in_stream_test.h"
 
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h b/content/test/plugin/plugin_delete_plugin_in_stream_test.h
index c6bf009..646d5d6 100644
--- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h
+++ b/content/test/plugin/plugin_delete_plugin_in_stream_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -28,4 +28,4 @@ class DeletePluginInStreamTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_execute_stream_javascript.cc b/content/test/plugin/plugin_execute_stream_javascript.cc
index 7440dcf..33f6eec 100644
--- a/webkit/plugins/npapi/test/plugin_execute_stream_javascript.cc
+++ b/content/test/plugin/plugin_execute_stream_javascript.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 "webkit/plugins/npapi/test/plugin_execute_stream_javascript.h"
+#include "content/test/plugin/plugin_execute_stream_javascript.h"
 
 #include "base/basictypes.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_execute_stream_javascript.h b/content/test/plugin/plugin_execute_stream_javascript.h
index 8f9ffe1..6a3996e 100644
--- a/webkit/plugins/npapi/test/plugin_execute_stream_javascript.h
+++ b/content/test/plugin/plugin_execute_stream_javascript.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -29,4 +29,4 @@ class ExecuteStreamJavaScript : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_STREAM_JAVASCRIPT_H_
diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc b/content/test/plugin/plugin_get_javascript_url2_test.cc
index c76973d..a3c7c1a 100644
--- a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.cc
+++ b/content/test/plugin/plugin_get_javascript_url2_test.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 "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h"
+#include "content/test/plugin/plugin_get_javascript_url2_test.h"
 
 #include "base/basictypes.h"
 
diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h b/content/test/plugin/plugin_get_javascript_url2_test.h
index 63491d6..8d6f552 100644
--- a/webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h
+++ b/content/test/plugin/plugin_get_javascript_url2_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL2_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL2_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -38,4 +38,4 @@ class ExecuteGetJavascriptUrl2Test : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL2_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL2_H_
diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc b/content/test/plugin/plugin_get_javascript_url_test.cc
index 77d728d..185ce0f 100644
--- a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc
+++ b/content/test/plugin/plugin_get_javascript_url_test.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 "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h"
+#include "content/test/plugin/plugin_get_javascript_url_test.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h b/content/test/plugin/plugin_get_javascript_url_test.h
index a623325..e2e176c 100644
--- a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.h
+++ b/content/test/plugin/plugin_get_javascript_url_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -47,4 +47,4 @@ class ExecuteGetJavascriptUrlTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGINS_TEST_PLUGIN_GET_JAVASCRIPT_URL_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_GET_JAVASCRIPT_URL_H_
diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.cc b/content/test/plugin/plugin_geturl_test.cc
index f412bdd..3f87baa 100644
--- a/webkit/plugins/npapi/test/plugin_geturl_test.cc
+++ b/content/test/plugin/plugin_geturl_test.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 "webkit/plugins/npapi/test/plugin_geturl_test.h"
+#include "content/test/plugin/plugin_geturl_test.h"
 
 #include <stdio.h>
 
diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.h b/content/test/plugin/plugin_geturl_test.h
index c7a9800..d71093e 100644
--- a/webkit/plugins/npapi/test/plugin_geturl_test.h
+++ b/content/test/plugin/plugin_geturl_test.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_GETURL_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_GETURL_TEST_H_
 
 #include <stdio.h>
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -61,4 +61,4 @@ class PluginGetURLTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_GETURL_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc b/content/test/plugin/plugin_javascript_open_popup.cc
index c12edb5..761f9eb 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
+++ b/content/test/plugin/plugin_javascript_open_popup.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 "webkit/plugins/npapi/test/plugin_javascript_open_popup.h"
+#include "content/test/plugin/plugin_javascript_open_popup.h"
 
 #include "build/build_config.h"
 #include "base/logging.h"
@@ -10,7 +10,7 @@
 #if defined(USE_X11)
 #include "third_party/npapi/bindings/npapi_x11.h"
 #endif
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h b/content/test/plugin/plugin_javascript_open_popup.h
index b21cf27..1bc764e 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h
+++ b/content/test/plugin/plugin_javascript_open_popup.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -45,4 +45,4 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#endif // CONTENT_TEST_PLUGIN_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
diff --git a/webkit/plugins/npapi/test/plugin_new_fails_test.cc b/content/test/plugin/plugin_new_fails_test.cc
index 71cff01..1d2e53e 100644
--- a/webkit/plugins/npapi/test/plugin_new_fails_test.cc
+++ b/content/test/plugin/plugin_new_fails_test.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 "webkit/plugins/npapi/test/plugin_new_fails_test.h"
+#include "content/test/plugin/plugin_new_fails_test.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_new_fails_test.h b/content/test/plugin/plugin_new_fails_test.h
index d321a91..b6074f6 100644
--- a/webkit/plugins/npapi/test/plugin_new_fails_test.h
+++ b/content/test/plugin/plugin_new_fails_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -19,4 +19,4 @@ class NewFailsTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_npobject_identity_test.cc b/content/test/plugin/plugin_npobject_identity_test.cc
index 3d99ce1..74046e4 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_identity_test.cc
+++ b/content/test/plugin/plugin_npobject_identity_test.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/test/plugin/plugin_npobject_identity_test.h"
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
-#include "webkit/plugins/npapi/test/plugin_npobject_identity_test.h"
-
 namespace {
 
 class NPThingy : public NPObject {
diff --git a/webkit/plugins/npapi/test/plugin_npobject_identity_test.h b/content/test/plugin/plugin_npobject_identity_test.h
index 93b2e78..3f8b7bd 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_identity_test.h
+++ b/content/test/plugin/plugin_npobject_identity_test.h
@@ -1,10 +1,11 @@
 // 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.
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "base/compiler_specific.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -23,4 +24,4 @@ class NPObjectIdentityTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_IDENTITY_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc b/content/test/plugin/plugin_npobject_lifetime_test.cc
index 7c8b15d..7ef5d26 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc
+++ b/content/test/plugin/plugin_npobject_lifetime_test.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 "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h"
+#include "content/test/plugin/plugin_npobject_lifetime_test.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h b/content/test/plugin/plugin_npobject_lifetime_test.h
index 2564c6d..baf0ee8 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h
+++ b/content/test/plugin/plugin_npobject_lifetime_test.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -82,4 +82,4 @@ class NPObjectDeletePluginInNPN_Evaluate : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc b/content/test/plugin/plugin_npobject_proxy_test.cc
index 37a7914..3993cbe 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc
+++ b/content/test/plugin/plugin_npobject_proxy_test.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/test/plugin/plugin_npobject_proxy_test.h"
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
-#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h"
-
 namespace NPAPIClient {
 
 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions)
diff --git a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h b/content/test/plugin/plugin_npobject_proxy_test.h
index 2f66dad..e732efd 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.h
+++ b/content/test/plugin/plugin_npobject_proxy_test.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_PROXY_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_PROXY_TEST_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "base/compiler_specific.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -24,4 +25,4 @@ class NPObjectProxyTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_PROXY_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_NPOBJECT_PROXY_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_private_test.cc b/content/test/plugin/plugin_private_test.cc
index cdfa8a9..22b1a33 100644
--- a/webkit/plugins/npapi/test/plugin_private_test.cc
+++ b/content/test/plugin/plugin_private_test.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 "webkit/plugins/npapi/test/plugin_private_test.h"
+#include "content/test/plugin/plugin_private_test.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_private_test.h b/content/test/plugin/plugin_private_test.h
index 2122c73..a382669 100644
--- a/webkit/plugins/npapi/test/plugin_private_test.h
+++ b/content/test/plugin/plugin_private_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_PRIVATE_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_PRIVATE_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -23,4 +23,4 @@ class PrivateTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_PRIVATE_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_request_read_test.cc b/content/test/plugin/plugin_request_read_test.cc
index a6bf677..dfdcd52 100644
--- a/webkit/plugins/npapi/test/plugin_request_read_test.cc
+++ b/content/test/plugin/plugin_request_read_test.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 "webkit/plugins/npapi/test/plugin_request_read_test.h"
+#include "content/test/plugin/plugin_request_read_test.h"
 
 #include "base/basictypes.h"
 
diff --git a/webkit/plugins/npapi/test/plugin_request_read_test.h b/content/test/plugin/plugin_request_read_test.h
index de227f5..67c8a70 100644
--- a/webkit/plugins/npapi/test/plugin_request_read_test.h
+++ b/content/test/plugin/plugin_request_read_test.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_REQUEST_READ_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_REQUEST_READ_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_REQUEST_READ_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_REQUEST_READ_TEST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -43,5 +43,5 @@ class PluginRequestReadTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_REQUEST_READ_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_REQUEST_READ_TEST_H_
 
diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc b/content/test/plugin/plugin_schedule_timer_test.cc
index db66a72..950745d 100644
--- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc
+++ b/content/test/plugin/plugin_schedule_timer_test.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 "webkit/plugins/npapi/test/plugin_schedule_timer_test.h"
+#include "content/test/plugin/plugin_schedule_timer_test.h"
 
 #include "base/logging.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 using base::Time;
 
diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h b/content/test/plugin/plugin_schedule_timer_test.h
index cd4ef6d..e13891a 100644
--- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h
+++ b/content/test/plugin/plugin_schedule_timer_test.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_SCHEDULE_TIMER_TEST_H
+#define CONTENT_TEST_PLUGIN_PLUGIN_SCHEDULE_TIMER_TEST_H
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -62,4 +62,4 @@ class ScheduleTimerTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SCHEDULE_TIMER_TEST_H
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_SCHEDULE_TIMER_TEST_H
diff --git a/webkit/plugins/npapi/test/plugin_setup_test.cc b/content/test/plugin/plugin_setup_test.cc
index 3d96a539..02f85f1 100644
--- a/webkit/plugins/npapi/test/plugin_setup_test.cc
+++ b/content/test/plugin/plugin_setup_test.cc
@@ -5,7 +5,7 @@
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 
-#include "webkit/plugins/npapi/test/plugin_setup_test.h"
+#include "content/test/plugin/plugin_setup_test.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_setup_test.h b/content/test/plugin/plugin_setup_test.h
index f4279c2..b00554e 100644
--- a/webkit/plugins/npapi/test/plugin_setup_test.h
+++ b/content/test/plugin/plugin_setup_test.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_SETUP_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_SETUP_TEST_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -21,4 +21,4 @@ class PluginSetupTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_SETUP_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/content/test/plugin/plugin_test.cc
index 8dc9b4c..eb2d8640 100644
--- a/webkit/plugins/npapi/test/plugin_test.cc
+++ b/content/test/plugin/plugin_test.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 "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "webkit/plugins/npapi/test/npapi_constants.h"
+#include "content/test/plugin/npapi_constants.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_test.h b/content/test/plugin/plugin_test.h
index ee8752c..e2f5124 100644
--- a/webkit/plugins/npapi/test/plugin_test.h
+++ b/content/test/plugin/plugin_test.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 WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_TEST_H_
 
 #include <string>
 
@@ -101,4 +101,4 @@ class PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_test_factory.cc b/content/test/plugin/plugin_test_factory.cc
index eceb852..cd5550a 100644
--- a/webkit/plugins/npapi/test/plugin_test_factory.cc
+++ b/content/test/plugin/plugin_test_factory.cc
@@ -2,29 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/test/plugin_test_factory.h"
+#include "content/test/plugin/plugin_test_factory.h"
 
-#include "webkit/plugins/npapi/test/plugin_arguments_test.h"
-#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h"
-#include "webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h"
-#include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h"
-#include "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h"
-#include "webkit/plugins/npapi/test/plugin_geturl_test.h"
-#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h"
-#include "webkit/plugins/npapi/test/plugin_new_fails_test.h"
-#include "webkit/plugins/npapi/test/plugin_npobject_identity_test.h"
-#include "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h"
-#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h"
-#include "webkit/plugins/npapi/test/plugin_private_test.h"
-#include "webkit/plugins/npapi/test/plugin_request_read_test.h"
-#include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h"
-#include "webkit/plugins/npapi/test/plugin_setup_test.h"
-#include "webkit/plugins/npapi/test/plugin_thread_async_call_test.h"
-#include "webkit/plugins/npapi/test/plugin_window_size_test.h"
+#include "content/test/plugin/plugin_arguments_test.h"
+#include "content/test/plugin/plugin_delete_plugin_in_stream_test.h"
+#include "content/test/plugin/plugin_delete_plugin_in_deallocate_test.h"
+#include "content/test/plugin/plugin_get_javascript_url_test.h"
+#include "content/test/plugin/plugin_get_javascript_url2_test.h"
+#include "content/test/plugin/plugin_geturl_test.h"
+#include "content/test/plugin/plugin_javascript_open_popup.h"
+#include "content/test/plugin/plugin_new_fails_test.h"
+#include "content/test/plugin/plugin_npobject_identity_test.h"
+#include "content/test/plugin/plugin_npobject_lifetime_test.h"
+#include "content/test/plugin/plugin_npobject_proxy_test.h"
+#include "content/test/plugin/plugin_private_test.h"
+#include "content/test/plugin/plugin_request_read_test.h"
+#include "content/test/plugin/plugin_schedule_timer_test.h"
+#include "content/test/plugin/plugin_setup_test.h"
+#include "content/test/plugin/plugin_thread_async_call_test.h"
+#include "content/test/plugin/plugin_window_size_test.h"
 #if defined(OS_WIN)
-#include "webkit/plugins/npapi/test/plugin_windowed_test.h"
+#include "content/test/plugin/plugin_windowed_test.h"
 #endif
-#include "webkit/plugins/npapi/test/plugin_windowless_test.h"
+#include "content/test/plugin/plugin_windowless_test.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_test_factory.h b/content/test/plugin/plugin_test_factory.h
index f1ed661..be294f3 100644
--- a/webkit/plugins/npapi/test/plugin_test_factory.h
+++ b/content/test/plugin/plugin_test_factory.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 WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_TEST_FACTROY_H__
+#define CONTENT_TEST_PLUGIN_PLUGIN_TEST_FACTROY_H__
 
 #include <string>
 
@@ -19,4 +19,4 @@ extern PluginTest* CreatePluginTest(const std::string& test_name,
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_FACTROY_H__
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_TEST_FACTROY_H__
diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc b/content/test/plugin/plugin_thread_async_call_test.cc
index 67e3058..096041c 100644
--- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc
+++ b/content/test/plugin/plugin_thread_async_call_test.cc
@@ -5,13 +5,13 @@
 #define UNIT_TEST  // To get the ShadowingAtExitManager.
 #include "base/at_exit.h"
 
-#include "webkit/plugins/npapi/test/plugin_thread_async_call_test.h"
+#include "content/test/plugin/plugin_thread_async_call_test.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.h b/content/test/plugin/plugin_thread_async_call_test.h
index 60a6bb6..ea8ea75b 100644
--- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.h
+++ b/content/test/plugin/plugin_thread_async_call_test.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace base {
 class ShadowingAtExitManager;
@@ -38,4 +38,4 @@ class PluginThreadAsyncCallTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_THREAD_ASYNC_CALL_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_window_size_test.cc b/content/test/plugin/plugin_window_size_test.cc
index abc08ad..701b58a 100644
--- a/webkit/plugins/npapi/test/plugin_window_size_test.cc
+++ b/content/test/plugin/plugin_window_size_test.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/test/plugin_window_size_test.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_window_size_test.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_window_size_test.h b/content/test/plugin/plugin_window_size_test.h
index f52247e..6435a6f 100644
--- a/webkit/plugins/npapi/test/plugin_window_size_test.h
+++ b/content/test/plugin/plugin_window_size_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_WINDOW_SIZE_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_WINDOW_SIZE_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -22,4 +22,4 @@ class PluginWindowSizeTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOW_SIZE_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_WINDOW_SIZE_TEST_H_
diff --git a/webkit/plugins/npapi/test/plugin_windowed_test.cc b/content/test/plugin/plugin_windowed_test.cc
index 8377a47..150d256 100644
--- a/webkit/plugins/npapi/test/plugin_windowed_test.cc
+++ b/content/test/plugin/plugin_windowed_test.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 "webkit/plugins/npapi/test/plugin_windowed_test.h"
+#include "content/test/plugin/plugin_windowed_test.h"
 
 #include "base/logging.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/plugins/npapi/test/plugin_windowed_test.h b/content/test/plugin/plugin_windowed_test.h
index 4906933..9cb2869 100644
--- a/webkit/plugins/npapi/test/plugin_windowed_test.h
+++ b/content/test/plugin/plugin_windowed_test.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_WINDOWED_TEST_H
+#define CONTENT_TEST_PLUGIN_PLUGIN_WINDOWED_TEST_H
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -30,4 +30,4 @@ class WindowedPluginTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_WINDOWED_TEST_H
diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/content/test/plugin/plugin_windowless_test.cc
index 117834b..9b126c9 100644
--- a/webkit/plugins/npapi/test/plugin_windowless_test.cc
+++ b/content/test/plugin/plugin_windowless_test.cc
@@ -4,11 +4,11 @@
 
 #define STRSAFE_NO_DEPRECATE
 
-#include "webkit/plugins/npapi/test/plugin_windowless_test.h"
+#include "content/test/plugin/plugin_windowless_test.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "content/test/plugin/plugin_client.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdkx.h>
diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.h b/content/test/plugin/plugin_windowless_test.h
index 3b1c313..6a5ea8b7 100644
--- a/webkit/plugins/npapi/test/plugin_windowless_test.h
+++ b/content/test/plugin/plugin_windowless_test.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
+#ifndef CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
+#define CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "content/test/plugin/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -38,4 +38,4 @@ class WindowlessPluginTest : public PluginTest {
 
 }  // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
+#endif  // CONTENT_TEST_PLUGIN_PLUGIN_EXECUTE_SCRIPT_DELETE_TEST_H_
diff --git a/webkit/plugins/npapi/test/resource.h b/content/test/plugin/resource.h
index 422861f..422861f 100644
--- a/webkit/plugins/npapi/test/resource.h
+++ b/content/test/plugin/resource.h
diff --git a/webkit/plugins/webkit_plugins.gyp b/webkit/plugins/webkit_plugins.gyp
index 2d5209d..605f3df 100644
--- a/webkit/plugins/webkit_plugins.gyp
+++ b/webkit/plugins/webkit_plugins.gyp
@@ -55,163 +55,5 @@
       ],
     },
   ],
-  'conditions': [
-    ['OS!="android" and OS!="ios"', {
-      # npapi test plugin doesn't build on android or ios
-      'targets': [
-        {
-          'target_name': 'npapi_test_common',
-          'type': 'static_library',
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-          ],
-          'sources': [
-            'npapi/test/npapi_constants.cc',
-            'npapi/test/npapi_constants.h',
-            'npapi/test/plugin_client.cc',
-            'npapi/test/plugin_client.h',
-            'npapi/test/plugin_test.cc',
-            'npapi/test/plugin_test.h',
-            'npapi/test/plugin_test_factory.h',
-          ],
-          'export_dependent_settings': [
-            '<(DEPTH)/base/base.gyp:base',
-          ],
-        },
-        {
-          'target_name': 'npapi_test_plugin',
-          'type': 'loadable_module',
-          'variables': {
-            'chromium_code': 1,
-          },
-          'mac_bundle': 1,
-          'dependencies': [
-            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-            'npapi_test_common',
-          ],
-          'sources': [
-            'npapi/test/npapi_test.cc',
-            'npapi/test/npapi_test.def',
-            'npapi/test/npapi_test.rc',
-            'npapi/test/plugin_arguments_test.cc',
-            'npapi/test/plugin_arguments_test.h',
-            'npapi/test/plugin_create_instance_in_paint.cc',
-            'npapi/test/plugin_create_instance_in_paint.h',
-            'npapi/test/plugin_delete_plugin_in_deallocate_test.cc',
-            'npapi/test/plugin_delete_plugin_in_deallocate_test.h',
-            'npapi/test/plugin_delete_plugin_in_stream_test.cc',
-            'npapi/test/plugin_delete_plugin_in_stream_test.h',
-            'npapi/test/plugin_execute_stream_javascript.cc',
-            'npapi/test/plugin_execute_stream_javascript.h',
-            'npapi/test/plugin_get_javascript_url_test.cc',
-            'npapi/test/plugin_get_javascript_url_test.h',
-            'npapi/test/plugin_get_javascript_url2_test.cc',
-            'npapi/test/plugin_get_javascript_url2_test.h',
-            'npapi/test/plugin_geturl_test.cc',
-            'npapi/test/plugin_geturl_test.h',
-            'npapi/test/plugin_javascript_open_popup.cc',
-            'npapi/test/plugin_javascript_open_popup.h',
-            'npapi/test/plugin_new_fails_test.cc',
-            'npapi/test/plugin_new_fails_test.h',
-            'npapi/test/plugin_npobject_identity_test.cc',
-            'npapi/test/plugin_npobject_identity_test.h',
-            'npapi/test/plugin_npobject_lifetime_test.cc',
-            'npapi/test/plugin_npobject_lifetime_test.h',
-            'npapi/test/plugin_npobject_proxy_test.cc',
-            'npapi/test/plugin_npobject_proxy_test.h',
-            'npapi/test/plugin_request_read_test.h',
-            'npapi/test/plugin_request_read_test.cc',
-            'npapi/test/plugin_schedule_timer_test.cc',
-            'npapi/test/plugin_schedule_timer_test.h',
-            'npapi/test/plugin_setup_test.cc',
-            'npapi/test/plugin_setup_test.h',
-            'npapi/test/plugin_thread_async_call_test.cc',
-            'npapi/test/plugin_thread_async_call_test.h',
-            'npapi/test/plugin_windowed_test.cc',
-            'npapi/test/plugin_windowed_test.h',
-            'npapi/test/plugin_private_test.cc',
-            'npapi/test/plugin_private_test.h',
-            'npapi/test/plugin_test_factory.cc',
-            'npapi/test/plugin_window_size_test.cc',
-            'npapi/test/plugin_window_size_test.h',
-            'npapi/test/plugin_windowless_test.cc',
-            'npapi/test/plugin_windowless_test.h',
-            'npapi/test/resource.h',
-          ],
-          'include_dirs': [
-            '../..',
-          ],
-          'xcode_settings': {
-            'INFOPLIST_FILE': '<(DEPTH)/webkit/plugins/npapi/test/Info.plist',
-          },
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                # TODO(port):  Port these.
-                 # plugin_npobject_lifetime_test.cc has win32-isms
-                #   (HWND, CALLBACK).
-                'npapi/test/plugin_npobject_lifetime_test.cc',
-                 # The window APIs are necessarily platform-specific.
-                'npapi/test/plugin_window_size_test.cc',
-                'npapi/test/plugin_windowed_test.cc',
-                 # Seems windows specific.
-                'npapi/test/plugin_create_instance_in_paint.cc',
-                'npapi/test/plugin_create_instance_in_paint.h',
-                 # windows-specific resources
-                'npapi/test/npapi_test.def',
-                'npapi/test/npapi_test.rc',
-              ],
-            }],
-            ['OS=="mac"', {
-              'product_extension': 'plugin',
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-                ],
-              },
-            }],
-            ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', {
-              # Shared libraries need -fPIC on x86-64
-              'cflags': ['-fPIC']
-            }],
-          ],
-        },
-        {
-          'target_name': 'copy_npapi_test_plugin',
-          'type': 'none',
-          'dependencies': [
-            'npapi_test_plugin',
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins',
-                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'],
-                },
-              ],
-            }],
-            ['OS=="mac"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins/',
-                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'],
-                },
-              ]
-            }],
-            ['os_posix == 1 and OS != "mac"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins',
-                  'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
-                },
-              ],
-            }],
-          ],
-        },
-      ],
-    }],
-  ],
 }