Renamed pepper_test_plugin target to npapi_pepper_test_plugin. The automated tests copy built dll to plugins folder so they can be found and loaded. But chrome only loads dlls whose name matches np*.dll pattern. Hence the change.

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

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

8 files changed, 95 insertions, 14 deletions

diff --git a/webkit/tools/npapi_pepper_test_plugin/Info.plist b/webkit/tools/npapi_pepper_test_plugin/Info.plist
new file mode 100644
index 0000000..3d06b29
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Copyright 2010 Google, Inc.</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.google.testpepperplugin</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>BRPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>WebPluginDescription</key>
+	<string>Simple NPAPI Pepper plug-in that handles tests</string>
+	<key>WebPluginMIMETypes</key>
+	<dict>
+		<key>pepper-application/x-pepper-test</key>
+		<dict>
+			<key>WebPluginExtensions</key>
+			<array>
+				<string>testpepper</string>
+			</array>
+			<key>WebPluginTypeDescription</key>
+			<string>Test Pepper API</string>
+		</dict>
+	</dict>
+	<key>WebPluginName</key>
+	<string>NPAPI Pepper Test PlugIn</string>
+</dict>
+</plist>
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.cc b/webkit/tools/npapi_pepper_test_plugin/main.cc
index 4560a79..4560a79 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/main.cc
diff --git a/webkit/tools/pepper_test_plugin/pepper_3d_test.cc b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.cc
index 60d57f9..d5df069 100644
--- a/webkit/tools/pepper_test_plugin/pepper_3d_test.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_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/tools/pepper_test_plugin/pepper_3d_test.h"
+#include "webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h"
 
 namespace {
 const int32 kCommandBufferSize = 1024 * 1024;
diff --git a/webkit/tools/pepper_test_plugin/pepper_3d_test.h b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h
index f9801d7..20b10ed 100644
--- a/webkit/tools/pepper_test_plugin/pepper_3d_test.h
+++ b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_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_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
-#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
+#ifndef WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
+#define WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
 
 #include "gpu/pgl/pgl.h"
 #include "third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.h"
@@ -53,4 +53,4 @@ class Pepper3DTest : public PluginTest {
 
 } // namespace NPAPIClient
 
-#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
+#endif  // WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
diff --git a/webkit/tools/npapi_pepper_test_plugin/plugin.def b/webkit/tools/npapi_pepper_test_plugin/plugin.def
new file mode 100644
index 0000000..2f62dfd
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/plugin.def
@@ -0,0 +1,6 @@
+LIBRARY   npapi_pepper_test_plugin
+
+EXPORTS
+  NP_GetEntryPoints   @1
+  NP_Initialize       @2
+  NP_Shutdown         @3
diff --git a/webkit/tools/npapi_pepper_test_plugin/plugin.rc b/webkit/tools/npapi_pepper_test_plugin/plugin.rc
new file mode 100644
index 0000000..6ee5243
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/plugin.rc
@@ -0,0 +1,29 @@
+1 VERSIONINFO

+ FILEVERSION 1,0,0,1

+ PRODUCTVERSION 1,0,0,1

+ FILEFLAGSMASK 0x17L

+ FILEFLAGS 0x0L

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "Google"

+            VALUE "FileDescription", "NPAPI Pepper Test Plugin"

+            VALUE "FileVersion", "1, 0, 0, 1"

+            VALUE "InternalName", "npapi_pepper_test_plugin"

+            VALUE "LegalCopyright", "Copyright (C) 2010"

+            VALUE "OriginalFilename", "npapi_pepper_test_plugin.dll"

+            VALUE "ProductName", "NPAPI Pepper Test Plugin"

+            VALUE "ProductVersion", "1, 0, 0, 1"

+            VALUE "MIMEType", "pepper-application/x-pepper-test"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

diff --git a/webkit/tools/pepper_test_plugin/pepper_test_factory.cc b/webkit/tools/npapi_pepper_test_plugin/test_factory.cc
index 1e22d0b..95055f3 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_factory.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/test_factory.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/glue/plugins/test/plugin_test_factory.h"
 
-#include "webkit/tools/pepper_test_plugin/pepper_3d_test.h"
+#include "webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index a414092..d40cac0 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -686,25 +686,25 @@
           ],
         },
         {
-          'target_name': 'pepper_test_plugin',
+          'target_name': 'npapi_pepper_test_plugin',
           'type': 'loadable_module',
           'mac_bundle': 1,
-          'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',
+          'msvs_guid': '821F3B89-6AE1-4254-99CB-93C04D0A79BE',
           'dependencies': [
             '<(DEPTH)/gpu/gpu.gyp:pgl',
             '<(DEPTH)/third_party/gles2_book/gles2_book.gyp:stencil_test',
             'npapi_test_common',
           ],
           'sources': [
-            '../pepper_test_plugin/pepper_3d_test.cc',
-            '../pepper_test_plugin/pepper_3d_test.h',
-            '../pepper_test_plugin/pepper_test_factory.cc',
-            '../pepper_test_plugin/pepper_test_plugin.cc',
-            '../pepper_test_plugin/pepper_test_plugin.def',
-            '../pepper_test_plugin/pepper_test_plugin.rc',
+            '../npapi_pepper_test_plugin/main.cc',
+            '../npapi_pepper_test_plugin/pepper_3d_test.cc',
+            '../npapi_pepper_test_plugin/pepper_3d_test.h',
+            '../npapi_pepper_test_plugin/plugin.def',
+            '../npapi_pepper_test_plugin/plugin.rc',
+            '../npapi_pepper_test_plugin/test_factory.cc',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/pepper_test_plugin/Info.plist',
+            'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_pepper_test_plugin/Info.plist',
           },
         },
       ],