port a webkit plugin test to non-win32

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

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

2 files changed, 5 insertions, 9 deletions

diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index 82a58d3..df3c716 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -10,6 +10,7 @@ env_res = env_res.Clone()
 input_files = [
     'npapi_constants.cc',
     'npapi_test.cc',
+    'plugin_arguments_test.cc',
     'plugin_delete_plugin_in_stream_test.cc',
     'plugin_get_javascript_url_test.cc',
     'plugin_new_fails_test.cc',
@@ -20,7 +21,6 @@ input_files = [
 if env['PLATFORM'] == 'win32':
   # TODO(port): Port these.
   input_files.extend([
-      'plugin_arguments_test.cc',
       'plugin_execute_script_delete_test.cc',
       'plugin_geturl_test.cc',
       'plugin_client.cc',                 # Includes not ported headers.
diff --git a/webkit/glue/plugins/test/plugin_arguments_test.cc b/webkit/glue/plugins/test/plugin_arguments_test.cc
index d6eac88..00f8edf 100644
--- a/webkit/glue/plugins/test/plugin_arguments_test.cc
+++ b/webkit/glue/plugins/test/plugin_arguments_test.cc
@@ -3,11 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-
-#if defined(OS_WIN)
-#define STRSAFE_NO_DEPRECATE
-#include <strsafe.h>
-#endif
+#include "base/string_util.h"
 
 #include "webkit/glue/plugins/test/plugin_arguments_test.h"
 
@@ -49,9 +45,9 @@ NPError PluginArgumentsTest::New(uint16 mode, int16 argc,
       int size = atoi(size_string);
 
       for (int index = 1; index <= max_args; index++) {
-        char arg_name[MAX_PATH];  // Use MAX_PATH for Max Name Length
-        StringCchPrintfA(arg_name, sizeof(arg_name), "%s%d", "val", index);
-        const char *val_string = GetArgValue(arg_name, argc, argn, argv);
+        std::string arg_name = StringPrintf("%s%d", "val", index);
+        const char *val_string = GetArgValue(arg_name.c_str(), argc, argn,
+                                             argv);
         ExpectAsciiStringNotEqual(val_string, (const char*)NULL);
         if (val_string != NULL)
           ExpectIntegerEqual((int)strlen(val_string), (index*size));