Revert of media: Move widevine CDM targets to WidevineCdm folder

third_party/widevine/cdm/BUILD.gn

Index: third_party/widevine/cdm/BUILD.gn
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
index 050f78c2b5455a7b3e8bae9087119f240f0b2cf1..e2093a58849f6d0cc6965b2e50b158468e05b35a 100644
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -67,7 +67,7 @@
   copy("widevinecdm") {
     sources = widevine_cdm_binary_files
     outputs = [
-      "$root_out_dir/WidevineCdm/{{source_file_part}}",
+      "$root_out_dir/{{source_file_part}}",
     ]
 
     # TODO(jrummell)
@@ -77,7 +77,6 @@
   assert(!is_chrome_branded, "Branded Chrome should have binary files to copy.")
   assert(!is_android, "Android should not have enable_pepper_cdms.")
   shared_library("widevinecdm") {
-    output_dir = "$root_out_dir/WidevineCdm"
     sources = [
       "//media/cdm/stub/stub_cdm.cc",
       "//media/cdm/stub/stub_cdm.h",
@@ -125,7 +124,6 @@
 
   ppapi_cdm_adapter("widevinecdmadapter") {
     defines = []
-    output_dir = "$root_out_dir/WidevineCdm"
     deps = [
       ":version_h",
       ":widevinecdm",
@@ -133,14 +131,14 @@
     ]
 
     if (is_linux) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/libwidevinecdm.so",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
     } else if (is_win) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/widevinecdm.dll.lib",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ]
     } else if (is_mac) {
-      ldflags = [ rebase_path("$root_out_dir/WidevineCdm/libwidevinecdm.dylib",
-                              root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/libwidevinecdm.dylib", root_build_dir) ]
     }
   }
 } else {