Plugins: Move Prerender tests to PPAPI and some refactoring.

content/public/test/ppapi_test_utils.h

Index: content/public/test/ppapi_test_utils.h
diff --git a/ppapi/shared_impl/test_harness_utils.h b/content/public/test/ppapi_test_utils.h
similarity index 34%
rename from ppapi/shared_impl/test_harness_utils.h
rename to content/public/test/ppapi_test_utils.h
index 0098969cf8b7ddc97e04deaf68da02fdfc9b06e4..c5701bf9af5c4f7444158c2130b3c87d412382a9 100644
--- a/ppapi/shared_impl/test_harness_utils.h
+++ b/content/public/test/ppapi_test_utils.h
@@ -1,29 +1,35 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 PPAPI_TESTS_TEST_HARNESS_UTILS_H_
-#define PPAPI_TESTS_TEST_HARNESS_UTILS_H_
+#ifndef CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_
+#define CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_
 
 #include <string>
-#include "base/files/file_path.h"
-#include "ppapi/shared_impl/ppapi_shared_export.h"
 
-// This file specifies utility functions used in Pepper testing in
-// browser_tests and content_browsertests.
+#include "base/files/file_path.h"
 
 namespace base {
 class CommandLine;
 }
 
+// This file specifies utility functions used in Pepper testing in
+// browser_tests and content_browsertests.
 namespace ppapi {
 
 // Strips prefixes used to annotate tests from a test name.
-std::string PPAPI_SHARED_EXPORT StripTestPrefixes(const std::string& test_name);
+std::string StripTestPrefixes(const std::string& test_name);
+
+// Registers the PPAPI test plugin to application/x-ppapi-tests. Returns true
+// on success, and false otherwise.
+bool RegisterTestPlugin(base::CommandLine* command_line);
 
-// Returns a platform-specific filename relative to the chrome executable.
-base::FilePath::StringType PPAPI_SHARED_EXPORT GetTestLibraryName();
+// Registers the PPAPI test plugin with some some extra parameters. Returns true
+// on success and false otherwise.
+bool RegisterTestPluginWithExtraParameters(
+    base::CommandLine* command_line,
+    const base::FilePath::StringType& extra_registration_parameters);
 
-} // namespace ppapi
+}  // namespace ppapi
 
-#endif  // PPAPI_TESTS_TEST_HARNESS_UTILS_H_
+#endif  // CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_