Revert "Bug 1990551 - Send tabs to other profiles from context menu. r=profiles-reviewers,fluent-reviewers,bolsson,jhirsch,sthompson" for causing bc failures @ browser_moveTabToProfile

This reverts commit 3b86383.

Author: amarc-mozilla

browser/base/content/browser-profiles.js

@@ -194,16 +194,6 @@ var gProfiles = {
     });
   },
 
-  async openTabsInProfile(aEvent, tabsToOpen) {
-    let profile = await SelectableProfileService.getProfile(
-      aEvent.target.getAttribute("profileid")
-    );
-    SelectableProfileService.launchInstance(
-      profile,
-      tabsToOpen.map(tab => tab.linkedBrowser.currentURI.spec)
-    );
-  },
-
   async handleCommand(aEvent) {
     switch (aEvent.target.id) {
       /* App menu button events */
@@ -257,16 +247,6 @@ var gProfiles = {
         this.launchProfile(aEvent.sourceEvent);
         break;
       }
-      case "Profiles:MoveTabsToProfile": {
-        let tabs;
-        if (TabContextMenu.contextTab.multiselected) {
-          tabs = gBrowser.selectedTabs;
-        } else {
-          tabs = [TabContextMenu.contextTab];
-        }
-        this.openTabsInProfile(aEvent.sourceEvent, tabs);
-        break;
-      }
     }
     /* Subpanel profile events that may be triggered in FxA menu or app menu */
     if (aEvent.target.classList.contains("profile-item")) {
@@ -447,50 +427,4 @@ var gProfiles = {
       profilesList.appendChild(button);
     }
   },
-
-  async populateMoveTabMenu(menuPopup) {
-    if (!SelectableProfileService.initialized) {
-      return;
-    }
-
-    const profiles = await SelectableProfileService.getAllProfiles();
-    const currentProfile = SelectableProfileService.currentProfile;
-
-    const separator = document.getElementById("moveTabSeparator");
-    separator.hidden = profiles.length < 2;
-
-    let existingItems = [
-      ...menuPopup.querySelectorAll(":scope > menuitem[profileid]"),
-    ];
-
-    for (let profile of profiles) {
-      if (profile.id === currentProfile.id) {
-        continue;
-      }
-
-      let menuitem = existingItems.shift();
-      let isNewItem = !menuitem;
-      if (isNewItem) {
-        menuitem = document.createXULElement("menuitem");
-        menuitem.setAttribute("tbattr", "tabbrowser-multiple-visible");
-        menuitem.setAttribute("data-l10n-id", "move-to-new-profile");
-        menuitem.setAttribute("command", "Profiles:MoveTabsToProfile");
-      }
-
-      menuitem.disabled = false;
-      menuitem.setAttribute("profileid", profile.id);
-      menuitem.setAttribute(
-        "data-l10n-args",
-        JSON.stringify({ profileName: profile.name })
-      );
-
-      if (isNewItem) {
-        menuPopup.appendChild(menuitem);
-      }
-    }
-    // If there's any old item to remove, do so now.
-    for (let remaining of existingItems) {
-      remaining.remove();
-    }
-  },
 };

browser/base/content/browser-sets.inc

@@ -78,7 +78,6 @@
     <command id="Profiles:CreateProfile" />
     <command id="Profiles:ManageProfiles" />
     <command id="Profiles:LaunchProfile" />
-    <command id="Profiles:MoveTabsToProfile" />
     <command id="Browser:NextTab" />
     <command id="Browser:PrevTab" />
     <command id="Browser:ShowAllTabs" />

browser/base/content/browser-sets.js

@@ -203,7 +203,6 @@ document.addEventListener(
           case "Profiles:CreateProfile":
           case "Profiles:ManageProfiles":
           case "Profiles:LaunchProfile":
-          case "Profiles:MoveTabsToProfile":
             gProfiles.handleCommand(event);
             break;
           case "Tools:Search":

browser/base/content/main-popupset.inc.xhtml

@@ -75,7 +75,6 @@
                   tbattr="tabbrowser-multiple-visible"/>
         <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"
                   tbattr="tabbrowser-multiple-visible"/>
-        <menuseparator id="moveTabSeparator" hidden="true"/>
       </menupopup>
     </menu>
     <menu id="context_sendTabToDevice"

browser/base/content/main-popupset.js

@@ -532,9 +532,6 @@ document.addEventListener(
         case "tabContextMenu":
           TabContextMenu.addNewBadge();
           break;
-        case "moveTabOptionsMenu":
-          gProfiles.populateMoveTabMenu(event.target);
-          break;
       }
     });
 

browser/components/backup/BackupService.sys.mjs

@@ -3315,10 +3315,8 @@ export class BackupService extends EventTarget {
           profile,
           // Using URL Search Params on this about: page didn't work because
           // the RPM communication so we use the hash and parse that instead.
-          [
-            "about:editprofile" +
-              (copiedProfile ? `#copiedProfileName=${copiedProfile.name}` : ""),
-          ]
+          "about:editprofile" +
+            (copiedProfile ? `#copiedProfileName=${copiedProfile.name}` : "")
         );
       }
 

browser/components/profiles/SelectableProfileService.sys.mjs

@@ -631,17 +631,13 @@ class SelectableProfileServiceClass extends EventEmitter {
    * Launch a new Firefox instance using the given selectable profile.
    *
    * @param {SelectableProfile} aProfile The profile to launch
-   * @param {Array<string>} aUrls An array of urls to open in launched profile
+   * @param {string} aUrl A url to open in launched profile
    */
-  launchInstance(aProfile, aUrls) {
+  launchInstance(aProfile, aUrl) {
     let args = [];
 
-    if (aUrls?.length) {
-      // See https://wiki.mozilla.org/Firefox/CommandLineOptions#-url_URL
-      // Use '-new-tab' instead of '-url' because when opening multiple URLs,
-      // Firefox always opens them as tabs in a new window and we want to
-      // attempt opening these tabs in an existing window.
-      args.push(...aUrls.flatMap(url => ["-new-tab", url]));
+    if (aUrl) {
+      args.push("-url", aUrl);
     } else {
       args.push(`--${COMMAND_LINE_ACTIVATE}`);
     }
@@ -1456,7 +1452,7 @@ class SelectableProfileServiceClass extends EventEmitter {
 
     let profile = await this.#createProfile();
     if (launchProfile) {
-      this.launchInstance(profile, ["about:newprofile"]);
+      this.launchInstance(profile, "about:newprofile");
     }
     return profile;
   }

browser/components/profiles/content/profile-selector.mjs

@@ -126,7 +126,7 @@ export class ProfileSelector extends MozLitElement {
       await this.setLaunchArguments(profile, url ? ["-url", url] : []);
       await this.selectableProfileService.uninit();
     } else {
-      this.selectableProfileService.launchInstance(profile, url ? [url] : []);
+      this.selectableProfileService.launchInstance(profile, url);
     }
 
     window.close();

browser/components/profiles/tests/browser/browser.toml

@@ -45,8 +45,6 @@ skip-if = [
 ["browser_menubar_profiles.js"]
 head = "../unit/head.js head.js"
 
-["browser_moveTabToProfile.js"]
-
 ["browser_notify_changes.js"]
 run-if = ["os != 'linux'"] # Linux clients cannot remote themselves.
 skip-if = ["os == 'mac' && os_version == '15.30' && arch == 'aarch64' && opt && !socketprocess_networking"] # Bug 1929273