PPAPI Testing: Clean up location of ppapi::StripTestPrefixes

BUG=478309

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

Cr-Commit-Position: refs/heads/master@{#329874}

chrome/test/ppapi/ppapi_browsertest.cc

@@ -22,10 +22,10 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/javascript_test_observer.h"
-#include "content/public/test/ppapi_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "extensions/common/constants.h"
 #include "extensions/test/extension_test_message_listener.h"
+#include "ppapi/shared_impl/test_utils.h"
 
 using content::RenderViewHost;
 

content/public/test/ppapi_test_utils.cc

@@ -38,12 +38,6 @@ bool RegisterPlugin(
 
 }  // namespace
 
-std::string StripTestPrefixes(const std::string& test_name) {
-  if (test_name.find("DISABLED_") == 0)
-    return test_name.substr(strlen("DISABLED_"));
-  return test_name;
-}
-
 bool RegisterTestPlugin(base::CommandLine* command_line) {
   return RegisterTestPluginWithExtraParameters(command_line,
                                                FILE_PATH_LITERAL(""));

content/public/test/ppapi_test_utils.h

@@ -5,8 +5,6 @@
 #ifndef CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_
 
-#include <string>
-
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 
@@ -18,9 +16,6 @@ class CommandLine;
 // browser_tests and content_browsertests.
 namespace ppapi {
 
-// Strips prefixes used to annotate tests from a 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) WARN_UNUSED_RESULT;

content/renderer/pepper/v8_var_converter_unittest.cc

@@ -22,7 +22,7 @@
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
 #include "ppapi/shared_impl/test_globals.h"
-#include "ppapi/shared_impl/unittest_utils.h"
+#include "ppapi/shared_impl/test_utils.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"

content/test/ppapi/ppapi_browsertest.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 "content/public/test/ppapi_test_utils.h"
 #include "content/test/ppapi/ppapi_test.h"
+#include "ppapi/shared_impl/test_utils.h"
 
 // This file lists tests for Pepper APIs (without NaCl) against content_shell.
 // TODO(teravest): Move more tests here. http://crbug.com/371873

ppapi/ppapi_tests.gypi

@@ -122,8 +122,8 @@
         'proxy/resource_message_test_sink.h',
         'shared_impl/test_globals.cc',
         'shared_impl/test_globals.h',
-        'shared_impl/unittest_utils.cc',
-        'shared_impl/unittest_utils.h',
+        'shared_impl/test_utils.cc',
+        'shared_impl/test_utils.h',
       ],
     },
 

ppapi/proxy/raw_var_data_unittest.cc

@@ -17,7 +17,7 @@
 #include "ppapi/shared_impl/resource_var.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
 #include "ppapi/shared_impl/test_globals.h"
-#include "ppapi/shared_impl/unittest_utils.h"
+#include "ppapi/shared_impl/test_utils.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"

ppapi/shared_impl/BUILD.gn

@@ -193,8 +193,8 @@ source_set("test_support") {
   sources = [
     "test_globals.cc",
     "test_globals.h",
-    "unittest_utils.cc",
-    "unittest_utils.h",
+    "test_utils.cc",
+    "test_utils.h",
   ]
 
   deps = [

ppapi/shared_impl/unittest_utils.cc → ppapi/shared_impl/test_utils.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 "ppapi/shared_impl/unittest_utils.h"
+#include "ppapi/shared_impl/test_utils.h"
 
 #include <cmath>
 
@@ -209,4 +209,10 @@ bool TestEqual(const PP_Var& expected,
   return Equals(expected, actual, test_string_references, &visited_map);
 }
 
+std::string StripTestPrefixes(const std::string& test_name) {
+  if (test_name.find("DISABLED_") == 0)
+    return test_name.substr(strlen("DISABLED_"));
+  return test_name;
+}
+
 }  // namespace ppapi

ppapi/shared_impl/unittest_utils.h → ppapi/shared_impl/test_utils.h

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_UNITTEST_UTILS_H_
-#define PPAPI_SHARED_IMPL_UNITTEST_UTILS_H_
+#ifndef PPAPI_SHARED_IMPL_TEST_UTILS_H_
+#define PPAPI_SHARED_IMPL_TEST_UTILS_H_
+
+#include <string>
 
 #include "ppapi/c/pp_var.h"
 
@@ -19,6 +21,8 @@ bool TestEqual(const PP_Var& expected,
                const PP_Var& actual,
                bool test_string_references);
 
+std::string StripTestPrefixes(const std::string& test_name);
+
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_UNITTEST_UTILS_H_
+#endif  // PPAPI_SHARED_IMPL_TEST_UTILS_H_

ppapi/tests/test_case.cc

@@ -18,11 +18,8 @@
 namespace {
 
 std::string StripPrefix(const std::string& test_name) {
-  const char* const prefixes[] = {
-      "FAILS_", "FLAKY_", "DISABLED_" };
-  for (size_t i = 0; i < sizeof(prefixes)/sizeof(prefixes[0]); ++i)
-    if (test_name.find(prefixes[i]) == 0)
-      return test_name.substr(strlen(prefixes[i]));
+  if (test_name.find("DISABLED_") == 0)
+    return test_name.substr(strlen("DISABLED_"));
   return test_name;
 }