Revert of media: Use platform specific folders for CDMs

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 410ac7b791b3a1aa6ecb1c3c121826420391802e..3bbf49e76822764d7006ac74ef388d3111beaf36 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1351,6 +1351,11 @@
               "//chrome")
     }
     if (enable_pepper_cdms) {
+      sources += [
+        "../browser/media/pepper_cdm_test_helper.cc",
+        "../browser/media/pepper_cdm_test_helper.h",
+      ]
+
       # Runtime dependencies.
       data_deps += [
         "//media/cdm/ppapi:clearkeycdmadapter",
@@ -1604,10 +1609,6 @@
     ]
 
     if (enable_pepper_cdms) {
-      deps += [
-        ":test_support",
-        "//media:cdm_paths",
-      ]
       data_deps = [
         "//media/cdm/ppapi:clearkeycdmadapter",
         "//third_party/widevine/cdm:widevinecdmadapter",