Revert of media: Use platform specific folders for CDMs

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 1333 matching lines @@
               ".",
               "//chrome")
     }
     if (enable_supervised_users) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sources,
               ".",
               "//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",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
     }
     if (!enable_print_preview) {
       sources -= [
         "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc",
         "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
@@ skipping 233 matching lines @@
     ]
 
     deps = [
       "//base/test:test_support_perf",
       "//testing/gtest",
       "//testing/perf",
       "//third_party/widevine/cdm:version_h",
     ]
 
     if (enable_pepper_cdms) {
-      deps += [
-        ":test_support",
-        "//media:cdm_paths",
-      ]
       data_deps = [
         "//media/cdm/ppapi:clearkeycdmadapter",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
     }
 
     # This target should not require the Chrome executable to run.
     assert_no_deps = [ "//chrome" ]
   }
 }
@@ skipping 766 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }