From d861885915e910415274ab3a978731190f42cd33 Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 4 Jan 2019 18:35:09 +0000
Subject: [PATCH] Bug 1513681 - part3 : rename 'AudibleAutoplayChild' actor
 r=jaws

Use more proper name for actor which will handle all autoplay related events.

Differential Revision: https://phabricator.services.mozilla.com/D14796

--HG--
rename : toolkit/actors/AudibleAutoplayChild.jsm => toolkit/actors/AutoplayChild.jsm
extra : moz-landing-system : lando
---
 ...bleAutoplayChild.jsm => AutoplayChild.jsm} |  4 ++--
 toolkit/actors/moz.build                      |  2 +-
 toolkit/modules/ActorManagerParent.jsm        | 20 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename toolkit/actors/{AudibleAutoplayChild.jsm => AutoplayChild.jsm} (86%)

diff --git a/toolkit/actors/AudibleAutoplayChild.jsm b/toolkit/actors/AutoplayChild.jsm
similarity index 86%
rename from toolkit/actors/AudibleAutoplayChild.jsm
rename to toolkit/actors/AutoplayChild.jsm
index 6c52a8957079..0fc288d0eb3b 100644
--- a/toolkit/actors/AudibleAutoplayChild.jsm
+++ b/toolkit/actors/AutoplayChild.jsm
@@ -4,11 +4,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var EXPORTED_SYMBOLS = ["AudibleAutoplayChild"];
+var EXPORTED_SYMBOLS = ["AutoplayChild"];
 
 ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
 
-class AudibleAutoplayChild extends ActorChild {
+class AutoplayChild extends ActorChild {
   handleEvent(event) {
     if (event.type == "AudibleAutoplayMediaOccurred") {
       this.mm.sendAsyncMessage("AudibleAutoplayMediaOccurred");
diff --git a/toolkit/actors/moz.build b/toolkit/actors/moz.build
index 095ff3c1055e..08d6554ad8d6 100644
--- a/toolkit/actors/moz.build
+++ b/toolkit/actors/moz.build
@@ -11,8 +11,8 @@ with Files('Finder*.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
 
 FINAL_TARGET_FILES.actors += [
-    'AudibleAutoplayChild.jsm',
     'AudioPlaybackChild.jsm',
+    'AutoplayChild.jsm',
     'BrowserChild.jsm',
     'ControllersChild.jsm',
     'DateTimePickerChild.jsm',
diff --git a/toolkit/modules/ActorManagerParent.jsm b/toolkit/modules/ActorManagerParent.jsm
index 566e938873a1..cc2333f6d63b 100644
--- a/toolkit/modules/ActorManagerParent.jsm
+++ b/toolkit/modules/ActorManagerParent.jsm
@@ -101,16 +101,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm");
 const {DefaultMap} = ExtensionUtils;
 
 let ACTORS = {
-  AudibleAutoplay: {
-    child: {
-      module: "resource://gre/actors/AudibleAutoplayChild.jsm",
-      events: {
-        "AudibleAutoplayMediaOccurred": {},
-        "GloballyAutoplayBlocked": {},
-      },
-    },
-  },
-
   AudioPlayback: {
     child: {
       module: "resource://gre/actors/AudioPlaybackChild.jsm",
@@ -124,6 +114,16 @@ let ACTORS = {
     },
   },
 
+  Autoplay: {
+    child: {
+      module: "resource://gre/actors/AutoplayChild.jsm",
+      events: {
+        "AudibleAutoplayMediaOccurred": {},
+        "GloballyAutoplayBlocked": {},
+      },
+    },
+  },
+
   Browser: {
     child: {
       module: "resource://gre/actors/BrowserChild.jsm",