rename from dom/media/gmp-plugin/cdm-fake.cpp
rename to dom/media/fake-cdm/cdm-fake.cpp

rename from dom/media/gmp-plugin/cdm-test-decryptor.cpp
rename to dom/media/fake-cdm/cdm-test-decryptor.cpp

rename from dom/media/gmp-plugin/cdm-test-decryptor.h
rename to dom/media/fake-cdm/cdm-test-decryptor.h

rename from dom/media/gmp-plugin/cdm-test-output-protection.h
rename to dom/media/fake-cdm/cdm-test-output-protection.h

rename from dom/media/gmp-plugin/cdm-test-storage.cpp
rename to dom/media/fake-cdm/cdm-test-storage.cpp

rename from dom/media/gmp-plugin/cdm-test-storage.h
rename to dom/media/fake-cdm/cdm-test-storage.h

rename from dom/media/gmp-plugin/manifest.json
rename to dom/media/fake-cdm/manifest.json

rename from dom/media/gmp-plugin/moz.build
rename to dom/media/fake-cdm/moz.build

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -29,19 +29,19 @@ with Files('RTC*'):
 
 component_av = ('Core', 'WebRTC: Audio/Video')
 with Files('GetUserMedia*'):
     BUG_COMPONENT = component_av
 
 DIRS += [
     'eme',
     'encoder',
+    'fake-cdm',
     'flac',
     'gmp',
-    'gmp-plugin',
     'gmp-plugin-openh264',
     'imagecapture',
     'ipc',
     'mediasink',
     'mediasource',
     'mp3',
     'ogg',
     'platforms',