Remove set-as-default experiment code (Fixes #16095) (#16096)

Author: alexgibson

bedrock/firefox/templates/firefox/new/desktop/download.html

@@ -8,14 +8,6 @@
 
 {% extends "firefox/new/desktop/base.html" %}
 
-{% set show_firefox_default_experiment = switch('experiment-firefox-new-default', ['en']) and country_code in ['US', 'CA'] %}
-
-{% block experiments %}
-  {% if show_firefox_default_experiment %}
-    {{ js_bundle('experiment-firefox-new-default') }}
-  {% endif %}
-{% endblock %}
-
 {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-desktop' %}
 {% set ios_url = app_store_url('firefox', 'mozilla-org-firefox-new') %}
 

bedrock/firefox/templates/firefox/new/desktop/experiment-firefox-new-default.html

@@ -753,15 +753,14 @@ class NewView(L10nTemplateView):
     ftl_files_map = {
         "firefox/new/basic/base_download.html": ["firefox/new/download"],
         "firefox/new/desktop/download.html": ["firefox/new/desktop"],
-        "firefox/new/desktop/experiment-firefox-new-default.html": ["firefox/new/desktop"],
     }
     activation_files = [
         "firefox/new/download",
         "firefox/new/desktop",
     ]
 
     # place expected ?v= values in this list
-    variations = ["treatment", "control"]
+    variations = []
 
     def get(self, *args, **kwargs):
         # Remove legacy query parameters (Bug 1236791)
@@ -802,18 +801,13 @@ def get_context_data(self, **kwargs):
     def get_template_names(self):
         variation = self.request.GET.get("variation", None)
         experience = self.request.GET.get("xv", None)
-        locale = l10n_utils.get_locale(self.request)
-        country = get_country_from_request(self.request)
 
         # ensure variant matches pre-defined value
         if variation not in self.variations:
             variation = None
 
         if ftl_file_is_active("firefox/new/desktop") and experience != "basic":
-            if variation == "treatment" and locale in ["en-US", "en-CA"] and country in ["US", "CA"]:
-                template = "firefox/new/desktop/experiment-firefox-new-default.html"
-            else:
-                template = "firefox/new/desktop/download.html"
+            template = "firefox/new/desktop/download.html"
         else:
             template = "firefox/new/basic/base_download.html"