Revert of media: Move widevine CDM targets to WidevineCdm folder

chrome/chrome_dll_bundle.gypi

 # Copyright (c) 2012 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.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 114 matching lines @@
       'files': [],
       'conditions': [
         ['branding == "Chrome"', {
           'files': [
             '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
           ],
         }],
       ],
     },
     {
-      # The adapter is not a complete plugin on its own. It needs the Widevine
-      # CDM to work.
-      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/WidevineCdm',
+      # This file is used by the component installer.
+      # It is not a complete plugin on its own.
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/',
       'files': [],
       'conditions': [
         ['branding == "Chrome"', {
           'files': [
-            '<(PRODUCT_DIR)/WidevineCdm/widevinecdmadapter.plugin',
+            '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
           ],
         }],
       ],
     },
     {
       # Copy of resources used by tests.
       'destination': '<(PRODUCT_DIR)/pseudo_locales',
       'files': [
           '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
       ],
@@ skipping 95 matching lines @@
       ],
     }],
     ['v8_use_external_startup_data==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/natives_blob.bin',
         '<(PRODUCT_DIR)/snapshot_blob.bin',
       ],
     }],
   ],  # conditions
 }